feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,509 Commits 108 Branches 368 Tags
76bf971cb9545793d56bc7805622a4d5d4871711
Commit Graph

2079 Commits

Author SHA1 Message Date
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
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
Christian Kandeler
a49e1e0104 SSH: Fix tests. 
Enable compilation with Qt 5 and remove a warning.

Change-Id: Ieed6ef829551122f37b4ce052288f8e0f76c9716
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
 2012-09-26 11:39:38 +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
Thomas Hartmann
7fee2d7a34 Tests:QmlDesigner: fixing changeGradientId 
Attaching a second RewriterView is not allowed.

Change-Id: I54055b36f86cd1cff0313edfd405c128c5783705
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 12:58:13 +02:00
Thomas Hartmann
2f0f887acc Tests.QmlDesigner: fixing testStatesBaseState 
We have to process events to ensure that the correct
data is actually delivered by qmlpuppet.

Change-Id: I5a8b18d20ced5c7b9279868c53fbee698a752b74
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 12:58:02 +02:00
Thomas Hartmann
facd24c6b5 Tests.QmlDesigner: fixing defaultPropertyValues 
Image does not exist have a revision 1.1.

Change-Id: I012cf4e3636239665b45369717fba8c3c61c0352
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-25 12:57:49 +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
Christian Kamm
47d2558f6f C++11: Fix bug with parsing ctor initializers. 
Task-number: QTCREATORBUG-7919

Change-Id: I12307c3fb6c20424c8b5aaf564a031924c755d25
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-25 11:03:18 +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
Thomas Hartmann
c620ea67f0 Tests.QmlDesigner: compile fix 
This header file is not needed and was moved
by recent refactoring.

Change-Id: I0899de93be4e6f03c42d94e128feaa203a12063d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-24 12:23:48 +02:00
Thomas Hartmann
102f915463 Tests.QmlDesigner: adding testBasicStatesQtQuick20 
Testing basic states for Qt Quick 2.0.

Change-Id: I86b4dbaffa3ec340eb175a1cd687eef465d87efe
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-24 12:21:42 +02:00
Thomas Hartmann
3c42ca4138 Tests.QmlDesigner: adding testQtQuick20BasicRectangle 
Basic test for Qt Quick 2.0.
This time using Rectangle (different prototype chain).

Change-Id: I5500fa5d1a6e2d049404944be81f0b5657cefe3c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2012-09-24 12:21:30 +02:00
Christian Kamm
a81389356e C++11: Fix and add test for simple decltype uses. 
Change-Id: I7f843fa96e33671ecb135b9db6f68d9f2cbf2fac
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-24 12:08:25 +02:00
Thomas Hartmann
3c5b64a722 Tests.QmlDesigner: adding basic test for Qt Quick 2.0 
Change-Id: Id98be8ec130eb5adfcbd490600369e8353f168b8
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-24 11:47:07 +02:00
Thomas Hartmann
e4114505ee QmlDesigner: fix regression uncovered by tests 
Fixing a regression in the meta info system.

We follow now Qthe Declarative1StateOperation convention (note the 1).
Since this data is provided by Qt Creator it is independent from any Qt
version. (4.8/5.1)

Also the type comparison was broken in NodeMetaInfo for <cpp> types.
PackageName() does retrieve the package name of the cpp type which might
be different from the one used in qualfiedTypeName().

Change-Id: I5cdae37c2024cdc89824e68168c16e2050051d06
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-20 12:01:20 +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
David Schulz
44177392ec Debugger: Add missing continue to simple test 
Change-Id: Ief142db796db9392d7d910c98c0dd1425e5f1230
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-19 16:35:40 +02:00
Thomas Hartmann
6fb9e90920 Tests.QmlDesigner: adding some QApplication::processEvents(); 
This is needed process all the events created by NodeInstanceView.

Change-Id: Ia2df51f5aafdc670e60a47064092123a1a100049
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:45 +02:00
Thomas Hartmann
96a41678c8 Tests.QmlDesigner: remove QSkip for working tests 
Change-Id: I85f61ff4b0ff5abcbff4ef766c4ca7706069bdbc
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:35 +02:00
Thomas Hartmann
4cc46ef904 Tests.QmlDesigner: fix testSubComponentManager() 
Types names changed.

Change-Id: Ide7cc23289ab490ff272ca99ee048ccc6c99d335
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:29 +02:00
Thomas Hartmann
55b7759a93 Tests.QmlDesigner: fix loadEmptyCoreModel() 
Attaching more then one rewriter is not a good idea.

Change-Id: I3ec000836dc21029b43003c4636927086f267d10
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:22 +02:00
Thomas Hartmann
7b3b3adaff Tests.QmlDesigner: fix testModelBasicOperations 
We have to respect the meta info. So we create a Flipable.

Change-Id: I427cce93e1cb6fea7ac1c70b0c1020234af3494d
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:14 +02:00
Thomas Hartmann
8a6c2a6001 Tests.QmlDesigner: fix testRewriterErrors 
Error {} was not an Error anymore since we ignore unknown types.
Rectangle does not have the property test. This triggers an error.

Change-Id: I838b12ba15c394a34f6f9176e5eb5826d54b0f2b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
 2012-09-19 16:31:01 +02:00