summaryrefslogtreecommitdiffstats
path: root/tools/qtestlib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'qt/master' into file-engine-refactorJoão Abecasis2010-11-233-7/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/corelib/io/io.pri src/corelib/io/qfsfileengine.cpp src/corelib/io/qfsfileengine_unix.cpp src/corelib/io/qfsfileengine_win.cpp src/s60installs/bwins/QtCoreu.def src/s60installs/bwins/QtDeclarativeu.def src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtCoreu.def src/s60installs/eabi/QtDeclarativeu.def src/s60installs/eabi/QtGuiu.def tests/auto/qapplication/test/test.pro tests/auto/qaudioinput/qaudioinput.pro tests/auto/qaudiooutput/qaudiooutput.pro tests/auto/qchar/qchar.pro tests/auto/qdiriterator/qdiriterator.pro tests/auto/qsound/qsound.pro
| * Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-262-2/+2
| |\
| | * Doc : Fixing typo.Sergio Ahumada2010-10-262-2/+2
| | |
| * | Inconsistency with deployment keyword .sources and .files.Miikka Heikkinen2010-10-081-5/+5
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Implement QFileSystemIterator for windows.Prasanth Ullattil2010-09-151-1/+0
| | | | | | | | | | | | | | | | | | | | The search is implemented using FindFirstFileEx(). Following optimizations are done * Using large Fetch buffer on Windows 7 * Querying only the long file name * Querying for directories only, depending on QDir::Filters Reviewed-by: Joao
* | Adding minimal QFileSystemIterator APIJoão Abecasis2010-08-311-0/+1
| | | | | | | | | | | | Only stubs, for now, but it's a start. Reviewed-by: Thomas Zander
* | Move canonicalPath() to the new qfilesystemengine_unixThomas Zander2010-08-301-0/+1
| | | | | | | | Reviewed-by: João Abecasis
* | Adding QFileSystemEntry and QFileSystemEngine to build systemJoão Abecasis2010-08-301-0/+2
|/ | | | | | | | Since we're refactoring code out of QFSFileEngine the new internal classes have to be compiled in together with the old engines. For the time being, we'll assume Mac uses the unix version of the engine. We'll fork those only if and as needed.
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-07-2013-1504/+1
|\ | | | | | | | | | | | | | | | | 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
| * Revert "Add the chart utility from qtestlib-tools."Rohan McGovern2010-07-2013-1488/+1
| | | | | | | | | | | | | | | | This reverts commit 453abe70fec02456aba2219025f5202060eaece1. Task-number: QT-3583 Reviewed-by: Jason McDonald
* | Fix the code for estimate whether the project is debug/release only in cetest.Liang Qi2010-04-191-2/+6
| | | | | | | | | | Reviewed-by: Miikka Heikkinen Reviewed-by: Joerg Bornemann
* | fix cetest build properlyJoerg Bornemann2010-04-122-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | cetest: remove source file duplicates from cetest.proJoerg Bornemann2010-03-261-2/+0
| | | | | | | | epocroot.cpp and registry.cpp are already in qmake_include.pri
* | cetest build fixJoerg Bornemann2010-03-251-1/+2
| | | | | | | | | | | | | | | | 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
* | cetest build fix for TCP sync connectionJoerg Bornemann2010-03-252-0/+24
| | | | | | | | Reviewed-by: mauricek
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 modifications for the Windows Mobile platform.ninerider2010-02-271-1/+6
| | | | | | | | | | | | 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.
* | Merge branch '4.6'Miikka Heikkinen2010-02-262-2/+4
|\ \ | |/ | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf
| * Fix for cetest.David Laing2010-02-262-2/+4
| | | | | | | | | | Recent refactorings of qmake caused cetest not to compile. This patch updates cetest to fix this issue.
* | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-204-0/+16
|\ \ | |/ |/| | | | | | | | | Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
| * MOBILITY-404 QS Windows.Wolfgang Beck2010-02-164-0/+16
| |
* | Cetest extensions for Windows Mobile device power operations.ninerider2010-02-193-0/+190
| | | | | | | | | | | | | | | | | | | | 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
* | Remote lib extensions for Windows Mobile device power operations.ninerider2010-02-192-0/+89
|/ | | | | | | | | | 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
* Update copyright year to 2010Jason McDonald2010-01-0628-28/+28
| | | | Reviewed-by: Trust Me
* cetest crashes and no helpful debugging providedKeith Isdale2009-11-061-3/+33
| | | | | | | | | | | 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
* Fixed `-debug' option to cetest deploying release DLLs.Rohan McGovern2009-10-161-0/+2
| | | | | | | | | | | | 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
* Update license headers again.Jason McDonald2009-09-0928-112/+112
| | | | Reviewed-by: Trust Me
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-3113-169/+169
| | | | Reviewed-by: Trust Me
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3115-195/+195
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update tech preview license header.Jason McDonald2009-08-3110-130/+130
| | | | | | | | Reviewed-by: Trust Me
| * Update license headers.Jason McDonald2009-08-1110-10/+10
| | | | | | | | Reviewed-by: Trust Me
* | Fixed compile of cetest.Rohan McGovern2009-08-253-4/+8
| | | | | | | | | | | | | | Broken in two different ways by the QtScript-JavaScriptCore integration and the S60 integration. Reviewed-by: Michael Goddard
* | Rename qlistdata.cpp (back) to qlist.cpp.Volker Hilsheimer2009-08-171-1/+1
| | | | | | | | | | | | | | | | 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
* | Update contact URL in license headers.Jason McDonald2009-08-1228-28/+28
| | | | | | | | Reviewed-by: Trust Me
* | cetcpsync: unneeded error message removedJoerg Bornemann2009-08-051-1/+2
| | | | | | | | | | If file deletion fails then I don't want to know it. cetest tries to delete files more than once.
* | cetest compile fixJoerg Bornemann2009-08-051-2/+3
| | | | | | | | Reviewed-by: TrustMe
* | small cleanup in cetestJoerg Bornemann2009-08-052-17/+18
| | | | | | | | Reviewed-by: TrustMe
* | missing license header added in cetcpsyncsvrJoerg Bornemann2009-08-051-0/+40
| | | | | | | | Reviewed-by: TrustMe
* | initial revision of cetcpsyncJoerg Bornemann2009-08-056-0/+996
| | | | | | | | | | | | | | This is the desktop client for communicating with a Windows CE device that runs the cetcpsync server. Reviewed-By: mauricek
* | initial revision of cetcpsyncserverJoerg Bornemann2009-08-057-0/+1398
| | | | | | | | | | | | | | cetcpsync is our simple ActiveSync replacement for Windows CE devices. This is the server which has to run on the device. Reviewed-By: mauricek
* | cetest: add support for cetcpsync (our simple ActiveSync replacement)Joerg Bornemann2009-08-055-7/+305
| | | | | | | | Reviewed-By: mauricek
* | fix linker error for the cetest toolJoerg Bornemann2009-07-221-1/+2
| | | | | | | | Reviewed-by: TrustMe
* | Let cetest return nonzero when it fails to run a test.Rohan McGovern2009-07-091-0/+1
| |
* | Improved cetest error reporting.Rohan McGovern2009-07-092-6/+10
| | | | | | | | | | | | | | | | | | | | | | 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"
* | Fixed cetest compile.Rohan McGovern2009-07-021-1/+1
| |
* | Let cetest deploy libraries other than for Qt to make it usable forRohan McGovern2009-07-021-5/+29
| | | | | | | | | | | | | | | | | | | | | | 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
* | Let QtRemote report the error code to cetest when creating the testRohan McGovern2009-07-023-5/+21
| | | | | | | | | | | | | | | | | | 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
* | Improve cetest error reporting.Rohan McGovern2009-07-023-2/+38
| | | | | | | | Reviewed-by: Michael Goddard
* | tools: Remove QT_WA and non-Unicode code paths, dropping Win9x and NT supportminiak2009-07-011-5/+5
| | | | | | | | | | | | | | Also QString::fromUtf16() -> QString::fromWCharArray() Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Update license headers in files that are new in 4.6.Jason McDonald2009-06-172-4/+4
| | | | | | | | Reviewed-by: Trust Me