| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| | |
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The DEPLOYMENT instruction uses .sources, while INSTALLS uses .files.
This is inconsistent, and we fix it in Qt 4 by adding .files as a
supported alternative for DEPLOYMENT.
This commit will be followed by a second, which aligns Qt build system.
For Qt 5, this needs to be cleaned up by removing support for .sources.
Task-number: QTBUG-3216
Reviewed-by: João Abecasis
Cherry-picked from 730a5d562fcb7be6428458962456033054f99e4c by
Frans Englich.
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
tests/auto/qimagereader/tst_qimagereader.cpp
tools/qtestlib/chart/database.cpp
tools/qtestlib/chart/database.h
tools/qtestlib/chart/reportgenerator.cpp
tools/qtestlib/chart/reportgenerator.h
|
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 453abe70fec02456aba2219025f5202060eaece1.
Task-number: QT-3583
Reviewed-by: Jason McDonald
|
| |
| |
| |
| |
| | |
Reviewed-by: Miikka Heikkinen
Reviewed-by: Joerg Bornemann
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Commit f5b19c173109c53bf3d8167573f7276cf39262d2 broke the build for
cetest. Reverting my initial naive attempt to fix this
bd5d323373dbaf9d827126b77895da253128c1e5.
We're introducing a new define for building qmake without generators.
QT_QMAKE_PARSER_ONLY is used for cetest and the qmake COM wrapper of
the Visual Studio Add-in.
Reviewed-by: ossi
|
| |
| |
| |
| | |
epocroot.cpp and registry.cpp are already in qmake_include.pri
|
| |
| |
| |
| |
| |
| |
| |
| | |
Introducing a new define for building qmake without generators.
QT_BUILD_QMAKE_NO_GENERATORS is used for cetest and the qmake COM
wrapper of the Visual Studio Add-in.
Reviewed-by: mauricek
|
| |
| |
| |
| | |
Reviewed-by: mauricek
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| |
| |
| | |
Test were changed to run in reasonable time on Windows Mobile.
Also some test were skipped for instance those using OpenGL.
OpenGL support for Windows Mobile is a forthcoming feature.
|
|\ \
| |/
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| |
| |
| |
| |
| | |
Recent refactorings of qmake caused cetest not to compile.
This patch updates cetest to fix this issue.
|
|\ \
| |/
|/|
| |
| |
| |
| | |
Conflicts:
configure.exe
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Options to reset (-reset) and change the power mode (-wake)
of the device were added. The reset is needed to put the
device in a defined state after an error has occurred.
The unattended power mode ensures that the reset can be
effected and that the device will not go to sleep.
Reviewed by: Joerg
|
|/
|
|
|
|
|
|
|
|
| |
Function to change the power mode and to reset the
device were added. The reset is needed to put the
device in a defined state after an error has occurred.
The unattended power mode ensures that the reset can be
effected and that the device will not go to sleep.
Reviewed by: Joerg
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
|
|
|
|
|
|
|
| |
Unguarded use of QList::first() leads to Q_ASSERT() if the list is empty
Add support for a "-d" option to project file print parser debugging
Do not make use of QMAKESPEC variables in .qmake.cache instead
determine the current default if mkspec was not passed to cetest
Task-number: QTBUG-5490
Reviewed-by: Lincoln Ramsay
Joerg Bornemann
|
|
|
|
|
|
|
|
|
|
|
|
| |
cetest was processing .pro files without build_pass set.
That's wrong, as it means the qmake logic is set up for generating
the debug-and-release glue project instead of the real project.
Until commit 75b41faff44a1488d88eca6e910d4b617cb42221, it didn't
matter. After that commit, cetest would always try to deploy
release versions of Qt DLLs even when run with `-debug'.
Reviewed-by: joerg
|
|
|
|
| |
Reviewed-by: Trust Me
|
|
|
|
| |
Reviewed-by: Trust Me
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/boxes/glshaders.cpp
demos/boxes/vector.h
demos/embedded/fluidlauncher/pictureflow.cpp
demos/embedded/fluidlauncher/pictureflow.h
doc/src/desktop-integration.qdoc
doc/src/distributingqt.qdoc
doc/src/examples-overview.qdoc
doc/src/examples.qdoc
doc/src/frameworks-technologies/dbus-adaptors.qdoc
doc/src/geometry.qdoc
doc/src/groups.qdoc
doc/src/objecttrees.qdoc
doc/src/platform-notes.qdoc
doc/src/plugins-howto.qdoc
doc/src/qt3support.qdoc
doc/src/qtdbus.qdoc
doc/src/qtdesigner.qdoc
doc/src/qtgui.qdoc
doc/src/qtmain.qdoc
doc/src/qtopengl.qdoc
doc/src/qtsvg.qdoc
doc/src/qtuiloader.qdoc
doc/src/qundo.qdoc
doc/src/richtext.qdoc
doc/src/topics.qdoc
src/corelib/tools/qdumper.cpp
src/gui/embedded/qkbdpc101_qws.cpp
src/gui/embedded/qkbdsl5000_qws.cpp
src/gui/embedded/qkbdusb_qws.cpp
src/gui/embedded/qkbdvr41xx_qws.cpp
src/gui/embedded/qkbdyopy_qws.cpp
src/gui/embedded/qmousebus_qws.cpp
src/gui/embedded/qmousevr41xx_qws.cpp
src/gui/embedded/qmouseyopy_qws.cpp
src/gui/painting/qpaintengine_d3d.cpp
src/gui/painting/qwindowsurface_d3d.cpp
src/opengl/gl2paintengineex/glgc_shader_source.h
src/opengl/gl2paintengineex/qglpexshadermanager.cpp
src/opengl/gl2paintengineex/qglpexshadermanager_p.h
src/opengl/gl2paintengineex/qglshader.cpp
src/opengl/gl2paintengineex/qglshader_p.h
src/opengl/util/fragmentprograms_p.h
src/plugins/kbddrivers/linuxis/linuxiskbdhandler.cpp
src/plugins/mousedrivers/linuxis/linuxismousehandler.cpp
src/script/parser/qscript.g
src/script/qscriptarray_p.h
src/script/qscriptasm_p.h
src/script/qscriptbuffer_p.h
src/script/qscriptclass.cpp
src/script/qscriptclassdata_p.h
src/script/qscriptcompiler.cpp
src/script/qscriptcompiler_p.h
src/script/qscriptcontext.cpp
src/script/qscriptcontext_p.cpp
src/script/qscriptcontext_p.h
src/script/qscriptcontextfwd_p.h
src/script/qscriptecmaarray.cpp
src/script/qscriptecmaarray_p.h
src/script/qscriptecmaboolean.cpp
src/script/qscriptecmacore.cpp
src/script/qscriptecmadate.cpp
src/script/qscriptecmadate_p.h
src/script/qscriptecmaerror.cpp
src/script/qscriptecmaerror_p.h
src/script/qscriptecmafunction.cpp
src/script/qscriptecmafunction_p.h
src/script/qscriptecmaglobal.cpp
src/script/qscriptecmaglobal_p.h
src/script/qscriptecmamath.cpp
src/script/qscriptecmamath_p.h
src/script/qscriptecmanumber.cpp
src/script/qscriptecmanumber_p.h
src/script/qscriptecmaobject.cpp
src/script/qscriptecmaobject_p.h
src/script/qscriptecmaregexp.cpp
src/script/qscriptecmaregexp_p.h
src/script/qscriptecmastring.cpp
src/script/qscriptecmastring_p.h
src/script/qscriptengine.cpp
src/script/qscriptengine_p.cpp
src/script/qscriptengine_p.h
src/script/qscriptenginefwd_p.h
src/script/qscriptextenumeration.cpp
src/script/qscriptextenumeration_p.h
src/script/qscriptextqobject.cpp
src/script/qscriptextqobject_p.h
src/script/qscriptextvariant.cpp
src/script/qscriptfunction.cpp
src/script/qscriptfunction_p.h
src/script/qscriptgc_p.h
src/script/qscriptmember_p.h
src/script/qscriptobject_p.h
src/script/qscriptprettypretty.cpp
src/script/qscriptprettypretty_p.h
src/script/qscriptvalue.cpp
src/script/qscriptvalueimpl.cpp
src/script/qscriptvalueimpl_p.h
src/script/qscriptvalueimplfwd_p.h
src/script/qscriptvalueiteratorimpl.cpp
src/script/qscriptxmlgenerator.cpp
src/script/qscriptxmlgenerator_p.h
tests/auto/linguist/lupdate/testdata/recursivescan/project.ui
tests/auto/linguist/lupdate/testdata/recursivescan/sub/finddialog.cpp
tests/auto/qkeyevent/tst_qkeyevent.cpp
tools/linguist/shared/cpp.cpp
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
Broken in two different ways by the QtScript-JavaScriptCore
integration and the S60 integration.
Reviewed-by: Michael Goddard
|
| |
| |
| |
| |
| |
| |
| |
| | |
In the old days, some compilers would implicitly include the *.cpp
file if the *.h file contained templates. That's why we had qlistdata.cpp
not qlist.cpp. Those compilers are no longer supported.
Rev-by: Harald Fernengel
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| | |
If file deletion fails then I don't want to know it.
cetest tries to delete files more than once.
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |
| |
| |
| |
| |
| |
| | |
This is the desktop client for communicating with a Windows CE device
that runs the cetcpsync server.
Reviewed-By: mauricek
|
| |
| |
| |
| |
| |
| |
| | |
cetcpsync is our simple ActiveSync replacement for Windows CE devices.
This is the server which has to run on the device.
Reviewed-By: mauricek
|
| |
| |
| |
| | |
Reviewed-By: mauricek
|
| |
| |
| |
| | |
Reviewed-by: TrustMe
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Now, if you try to run an unsigned test on a locked device,
you'll get:
"Error invoking qRemoteLaunch on \Windows\QtRemote.dll: Invalid Signature. (0x80090006)"
Instead of what you would previously get:
"Error: Could not execute target file"
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
running unit tests for projects outside of Qt.
Let cetest look in the paths given with `-L' in LIBS, and to
deploy libraries whose names don't start with `Qt'. This
also fixes deployment of Qt autotests which link against phonon
(the only Qt library whose name doesn't start with `Qt').
Reviewed-by: mauricek
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
process fails.
This gives some hint to the user in the case of problems like missing
DLLs, as opposed to silent failure.
Reviewed-by: Michael Goddard
|
| |
| |
| |
| | |
Reviewed-by: Michael Goddard
|
| |
| |
| |
| |
| |
| |
| | |
Also QString::fromUtf16() -> QString::fromWCharArray()
Merge-request: 604
Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
A Qt project can't unconditionally do `CONFIG+=release' or
`CONFIG+=debug' since the release and debug libraries are named
differently on Windows. In this case, CONFIG+=release meant
this project was looking for QtSql.lib, but when Qt is configured
with `-debug', only QtSqld.lib exists.
Reviewed-by: Rhys Weatherley
|