feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
26,408 Commits 108 Branches 368 Tags
ab85e7342e7b51a10b6bf5ebc66c1a47c70f3fa6
Commit Graph

314 Commits

Author SHA1 Message Date
Eike Ziller
0a1bdf4257 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/share.qbs
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I13bc737c981aaeb615ab1a3571cc8a18f60a7cd6
 2012-10-25 10:45:58 +02:00
Robert Loehning
d4c8f23999 Squish: Added tool to convert objects.map into tsv 
Change-Id: Icd86b82d55f0c994c80be04fc0006d577d11d2de
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-23 17:04:46 +02:00
Christian Stenger
86e544ce4c Squish: Fix typeLines() 
Change-Id: I13abcceebc3f61b508da658d5e9d4650fddff6ea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-23 09:16:06 +02:00
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
Robert Loehning
fa655dd407 Squish: Moved editor tests to editors suite 
Change-Id: I82bd92db762f7f997460ece4c2f77d0381dca6b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-19 14:21:24 +02:00
Robert Loehning
b262d50f13 Squish: Raised snooze in waitForCleanShutdown() 
Change-Id: Iae110755f979a78c5cb3e4199cfc851f1feccb0c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-19 13:32:39 +02:00
Christian Stenger
a1a3da9d2d Squish: Add test for renaming macros 
Change-Id: I9c9bc9556234ec321c6e3723f5276a0b66f6c90a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-19 13:29:55 +02:00
Robert Loehning
0299d54d2d Squish: Cleaned path maintenance in tst_build_speedcrunch 
Change-Id: Ic3cb8571c79ab2880975a439d893ba794c153d7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 19:32:17 +02:00
Robert Loehning
9ac92a938b Squish: Fixed validateSearchResult() 
Fixes fails in tst_CSUP04 introduced by 6b5bccd08e

Change-Id: I7ad33b745e7a55b078952ca88c9ee5123ffc639b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 17:22:42 +02:00
Robert Loehning
3e88f62f33 Squish: Hack for fixing waitForCleanShutdown() 
Change-Id: I925a59fdd96f161a324375ebee4b4588dfd035fb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 16:28:47 +02:00
Robert Loehning
6c1067c2ec Squish: Copying project to tempDir in tst_basic_cpp_support 
Change-Id: I1788ff642486204beb22bf0a02400c50fbb7f3bf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 16:26:51 +02:00
Robert Loehning
9687e18820 Squish: Removed outdated cleanups 
__removeTmpSettingsDir__() does it all.

Change-Id: Ic1eb2ef02665c5d863956a1587f4f46344743f8e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-18 16:26:28 +02:00
Eike Ziller
49d5c2381a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
 2012-10-18 10:40:11 +02:00
Robert Loehning
b010720483 Squish: Removed workaround 
Bug is fixed in Qt 4.8.3

Task-number: QTCREATORBUG-7215
Change-Id: Idccfa11bf23ef4ed1962a8f84cf039b3de2bb8ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-17 16:24:13 +02:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
 2012-10-16 17:42:10 +02:00
Robert Loehning
a630a26810 Squish: Updated tst_WELP01 
Change-Id: Ie4440b404e306b7eb89ad9d344a8d0fb3b7294ae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-12 13:09:15 +02:00
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
 2012-10-11 21:11:40 +02:00
Christian Stenger
27dd24ce7f Squish: Provide tool for objects.map 
This is just a simple helper that works for the current
approach (a single objects.map within the root of Squish
tests).

Change-Id: I27bbc6d100f5196ada0e8c7a9ffe281a53fa0abd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-11 09:47:59 +02:00
Christian Stenger
93ff2db370 Squish: Enhance function to create new project 
This is a preparation for an upcoming patch.

Change-Id: Ia3ed2ca8a68aa3ccb8ecf304e40abd8055afd5c0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-10 11:53:30 +02:00
Robert Loehning
69a15c0e5a Squish: Updated URI 
Change-Id: Idc9c39c826f4283ceb01ec5a0117355d22950099
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-09 14:43:33 +02:00
Eike Ziller
086dd684ab Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
 2012-10-09 14:27:29 +02:00
Robert Loehning
996479e64f Squish: Move settings from Nokia to QtProject 
Follow up to f0629b6b77

Task-number: QTCREATORBUG-7976
Change-Id: Ie92cf51fbba821a3ef8dc3202d1cd8e5b69c15a7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-09 13:17:57 +02:00
Eike Ziller
1504ca67fb More Nokia -> Digia/QtProject changes 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-09 12:24:24 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
 2012-10-09 11:50:17 +02:00
Christian Stenger
38e27f8056 Squish: Fix checkDebuggingLibrary() 
Additionally:
* extracted iterateKits() for better re-use
* added parameter to iterateQtVersions() for easier usage
  when using iterateKits() as well

Change-Id: I8bec8ca8e1e37a233c121dbcfbf1c89104f79a7d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-09 10:03:22 +02:00
Christian Stenger
5fb8040194 Squish: Stabilize placeCursorToLine() on Mac 
Change-Id: I3a3292b8576fe36107335e07e9f125fbd1478b80
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-10-08 16:12:46 +02:00
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
 2012-10-04 12:23:39 +02:00
Robert Loehning
4df4d1c0c4 Squish: Added test for automatic conversion from "." to "->" 
Change-Id: Ib1cd24818b691fc4ccd43b60ff4afdd4e0394fde
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-02 12:17:27 +02:00
Christian Stenger
68f2d2286a Squish: Set default compiler depending on arch 
Change-Id: I1be1c018e293bb8ac11ba24968e5ba3c391ccf92
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-09-28 16:28:02 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +02:00
Robert Loehning
cef7f0869f Squish: Moved test data to data file 
Change-Id: I1021a246fa58bf1a9293789d4b19a7bc2f3e486b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-27 18:25:31 +02:00
Robert Loehning
832bc738c7 Squish: Improved checks before working on projects 
Change-Id: Ieb230be55b94d00be272cb84796ce8fd22f4f8f7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-27 17:32:39 +02:00
Christian Stenger
2a497de23e Squish: Remove unused objects 
Change-Id: I62fb45c3057c2c171b16b75052c8461571ec7394
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-09-27 14:37:23 +02:00
Robert Loehning
05784397c3 Squish: Removed unused functions 
Change-Id: I9e12651454a0a35a934d27a890bdeaa55c7ca912
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-27 10:53:29 +02:00
Robert Loehning
3df129d4f6 Squish: Added Embedded Linux kit 
Change-Id: Idb8acb7b10af6f1a1249e8912aea9b7e26194482
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-26 14:20:56 +02:00
Robert Loehning
b4d456657c Squish: Added MSVC kit 
Change-Id: I79ae4e792fa2ed19d2580c4cd7de3669f22f08ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-26 13:14:33 +02:00
Robert Loehning
021436856f Squish: Removed workaround for QTCREATORBUG-6994 
Change-Id: Id4e5ee4f9235b768a3145e6c562e29e1662ac72d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-26 10:52:04 +02:00
Eike Ziller
a55d47544a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/plugins/qtsupport/baseqtversion.cpp
	src/tools/tools.pro

Change-Id: I43c391328ae747b3dc566f9db2384fedc1a6d0a5
 2012-09-26 10:01:04 +02:00
Christian Stenger
61753f7e08 Squish: Fix losing focus on Mac 
Change-Id: I4dcf69cd644e2a9c5de46de639abc69d90334342
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-09-25 15:26:38 +02:00
Robert Loehning
e51863ee1a Squish: More explicit name for Desktop kit 
Change-Id: Ibc711e37ca71d3543a8fa8b46fb2ac7c9c5c4129
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-25 14:11:12 +02:00
Christian Stenger
2a7b28a3b9 Squish: Fix getConfiguredKits() 
Change-Id: Ie8a38eedac3e89abbe0bfb659ccc57bb7a30990d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-09-25 13:44:09 +02:00
Robert Loehning
4a1be4d0b9 Squish: Fix in tst_create_proj_wizard 
Change-Id: I6d8541f1e734bc1f425456b22b2b392f181a62c7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-25 12:08:16 +02:00
Robert Loehning
543a29fef6 Squish: Added Harmattan Kit 
Change-Id: I01f95b250a9e708a58793f1fc859cd1152624bae
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-24 17:48:02 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
 2012-09-19 18:02:46 +02:00
Christian Stenger
93fb2928d6 Squish: Added new test cases/suite for welcome page 
Change-Id: Id01582e881b8150a76336bb4f3ea6511c4bcd249
Done-with: Jan Kerekes
Done-with: Pavol Grainda
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2012-09-19 16:16:08 +02:00
Robert Loehning
b99fd060e1 Squish: Updated tst_simple_debug 
Change-Id: Ida1508c5e2f15a3fc79066d5133b91c0f9e3affa
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-13 13:57:54 +02:00
Christian Stenger
75ee870259 Squish: Use global objects.map from inside SCOM 
Change-Id: Ib789dd239fb7dfbb684e2f97607aa30de205fe0b
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-13 10:02:46 +02:00
Christian Stenger
77a6b71f72 Squish: Use global objects.map from inside QMLS 
Change-Id: I5c37408bc3a0e232d7f2a70e01db510725f99df1
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 17:22:39 +02:00
Christian Stenger
7f98c517e1 Squish: Use global objects.map from inside HELP 
Change-Id: I3df21777eb06e002de318c094741e3ff878a5f17
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 14:08:44 +02:00
Christian Stenger
7218a2b428 Squish: Fix for UI change 
Change-Id: Ie3d0c8deae67020d7adcd2bd69807f190bc0be0a
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 12:56:47 +02:00