summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/master' into debian-packagingdebian-packagingKeith Isdale2010-08-0314-100/+195
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:research/qtuitestKeith Isdale2010-08-031-1/+7
| |\
| | * Fix issue when Qt Creator was sometimes running with the QtUiTest styledac2010-08-031-1/+7
| * | Support running tests on Maemo6Keith Isdale2010-08-033-7/+44
| |/
| * Get QtUiTest (X11 standalone) working again.dac2010-07-3010-92/+144
* | Merge branch 'master' into debian-packagingSunil Thaha2010-07-300-0/+0
|\|
| * Removed the debug comment from the libqtslave.pro fileSunil Thaha2010-07-301-1/+0
| * Fixed the target installation pathSunil Thaha2010-07-297-51/+15
* | Removed the debug comment from the libqtslave.pro fileSunil Thaha2010-07-301-1/+0
* | Added provision to build in parallel in debian/rules fileSunil Thaha2010-07-301-1/+11
* | Fixed the deb install filesSunil Thaha2010-07-292-3/+1
* | Fixed the target installation pathSunil Thaha2010-07-297-51/+15
* | Merge branch 'master' into debian-packagingSunil Thaha2010-07-2912-46/+89
|\|
| * Fixed the broken build in maemo5Sunil Thaha2010-07-291-1/+1
| * More Creator integrationdac2010-07-2911-45/+88
* | Modified the rules to run qmake on qtuitest-for-target.proSunil Thaha2010-07-291-1/+1
* | Overwrote the TARGET addition made by QtCreatorSunil Thaha2010-07-281875-1200/+190711
|\|
| * Merge branch 'master' of scm.dev.nokia.troll.no:research/qtuitestEd Baak2010-07-283-106/+0
| |\
| | * More cleanupdac2010-07-283-108/+0
| * | Resolve bad changes in target.path'sEd Baak2010-07-2813-42/+45
| * | Remove dependency to qtuitest libraries by including all code for qtuitestrun...Ed Baak2010-07-2849-637/+1576
| |/
| * Make libqsystemtest not depend on libqtuitest. Remove duplicate codedac2010-07-2814-640/+1707
| * Add new QTestIDE class to enable easier integration with creator.dac2010-07-2742-423/+398
| * Simplity botan library buildingKeith Isdale2010-07-262-3/+3
| * Update "deployment" rules for "testapps" for easier running on MaemoKeith Isdale2010-07-2612-25/+85
| * Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research...Keith Isdale2010-07-263-35/+125
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:research/qtuitestEd Baak2010-07-26269-0/+0
| | |\
| | * | Move Maemo specific code into MaemoTestDevice sub class. The same thing obvio...Ed Baak2010-07-263-35/+125
| * | | Remove Makefiles that were added by accidentKeith Isdale2010-07-262-1776/+0
| * | | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research...Keith Isdale2010-07-261810-18/+188865
| |\ \ \ | | | |/ | | |/|
| | * | Remove object files unexpectedly committed in commit 02e9b674.dac2010-07-26269-0/+0
| | |/
| | * Included Botan and ssh code to make QtUItest compile again (as a separate pac...Ed Baak2010-07-262079-18/+188865
| * | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research...Keith Isdale2010-07-264-38/+116
| |\|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:research/qtuitestEd Baak2010-07-265-9/+19
| | |\
| | | * Temporary fix to allow creator to setup testIDE when qtuitestrunnerdac2010-07-231-1/+3
| | * | Experimental submit ... use Creator's ssh connection classes to start/stop an...Ed Baak2010-07-264-37/+113
| * | | Ensure that we stop any running remote applicationsKeith Isdale2010-07-231-0/+19
| * | | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research...Keith Isdale2010-07-235-8/+16
| |\ \ \ | | | |/ | | |/|
| | * | Add support for function based breakpoints in debugger.dac2010-07-235-8/+16
| | |/
| * | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research...Keith Isdale2010-07-232-8/+11
| |\|
| | * Cleanup && don't try to reconnect : it's pointless.Ed Baak2010-07-231-3/+5
| | * Cleanup and add a version number. This is used by creator to ensure we are us...Ed Baak2010-07-231-5/+6
| * | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research...Keith Isdale2010-07-233-4/+6
| |\|
| | * Merge branch 'master' of scm.dev.nokia.troll.no:research/qtuitestEd Baak2010-07-231-1/+2
| | |\
| | * | fix compile issuesEd Baak2010-07-233-4/+6
| * | | Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research...Keith Isdale2010-07-2344-26/+395
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:research/qtuitestdac2010-07-2337-14/+370
| | |\|
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:research/qtuitestEd Baak2010-07-2314-13/+138
| | | |\
| | | * | Tweak code so that we can import it in creator-qtest - AND - continue to supp...Ed Baak2010-07-2312-18/+216
| | | * | Add target paths for all project files. Qt Creator added these lines for me.Ed Baak2010-07-2128-0/+157