feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,206 Commits 108 Branches 368 Tags
45361755f997a2a2714c95be73dda3900b51fd03
Commit Graph

2960 Commits

Author SHA1 Message Date
hjk
bddec831d8 debugger: add manual test to start processes 
Change-Id: Ia24fa547d1121f819f27248c67b4fbee0ff7512e
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-26 09:06:52 +02:00
Robert Loehning
95af1cd4f8 Squish: Added helper functions for views and models 
Change-Id: Ic5dc4a5fe11ec5f693ef9f5ddf3abbefd689fd99
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-25 13:58:34 +02:00
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
Nikolai Kosjar
112f80c6c6 Qt5: Fix warning "qtestlib is deprecated". 
"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-24 13:51:16 +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
Alessandro Portale
6b7501a1e2 Appwizard test: Fix compilation and warnings 
Change-Id: I6ec16d21c2c8554637361a48deddc71ebb52e7ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-10-23 16:12:34 +02:00
Nikolai Kosjar
6481deb8c8 C++: Fix crashes in tests with Qt5. 
tst_Semantic and tst_CodeFormatter crash with QTEST_APPLESS_MAIN since
they need to access some font settings via QTextDocument /
Q*Application. Use QTEST_MAIN instead.

Change-Id: Id85228acb6006cfaee41c634c6a32b6c23a70105
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2012-10-23 14:07:35 +02:00
Nikolai Kosjar
5d730be06e C++: Compile fixes in tests and tools. 
After some refactorings not all usages, especially in tests and tools,
were adapted.

Change-Id: I7ed24bb1c8e55e55ed74eda3a8fd7610e725f4cb
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-23 12:26:47 +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
hjk
6d785dd7d7 debugger: fix warning in manual test on mac 
Change-Id: I73809b42bb13bd38d9a30286334621b3b6e654dd
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-19 16:36:07 +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
f15745ab42 debugger: Fixed automatic run of self test 
Change-Id: Icf2c100db571a37bc9e20e0e9cab47a627cfec23
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-17 20:31:27 +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
hjk
9f1d8b66e3 debugger: fix display of gcc's built-in vector types 
Change-Id: I293be4f5c207828c64de30236a25f6c0062346b8
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-17 15:25:04 +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
Erik Verbruggen
e72be772c5 C++: added some notes regarding QTCREATORBUG-7968 
Change-Id: Ia7a0e4b416ba6ef768d76595d8576262a828ae78
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-10-11 08:53:51 +02:00
Robert Loehning
6bd79c979e debugger: Fixed issues in self test 
Change-Id: I06802b87f861307de3c8d2b617455afdce0127a4
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-10 19:36:56 +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
Eike Ziller
e6623754e8 One more Nokia replacement. 
Change-Id: Ic0a3718d0f1f12e8894c532d5cc034574e26ebeb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-10-09 15:49:48 +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
Thomas Hartmann
13d4972e67 QmlDesigner.MetaInfo: meta info fix for versions 
Version numbers were not respected in all cases in the meta system.
If we (just) have a QtQuick 2.0 import Rectangle 1.0 is not valid.

Also adding a test.

Change-Id: I2e1dc174aaa180ad1750f0eca04c6879ef6e304d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-09 14:39:44 +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
Thomas Hartmann
ac8f94a8d2 Test.QmlDesigner: removing declarative dependency 
Change-Id: Ib15120c846187bd37cf22fae88ae6ece20d2417a
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-10-08 14:30:52 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
Eike Ziller
68c796e244 Merge origin/2.6 
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
 2012-10-05 20:51:31 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
hjk
fac636602f debugger: fix build of manual test app with Qt 5 
Change-Id: I58f63941038978b665455025313faafc851bccc8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-10-04 17:27:02 +02:00
Orgad Shaneh
34354148db FileName: Fix isChildOf for some corner cases 
empty directory has no children, and root directory was not handled correctly

Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-04 16:50:02 +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