feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,929 Commits 108 Branches 368 Tags
3b901b25a86f49ebef9be03ec762ed76422fd91c
Commit Graph

1195 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
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
Christian Stenger
e98a947998 Squish: Use global objects.map from inside CSUP 
Change-Id: I70b80f926d01f801f842cd45ca3710b9d16de273
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-12 12:45:15 +02:00
Robert Loehning
e16eb7ea43 Removed unneeded and mistyped HTML 
Change-Id: I49f50fc213b88af478c1411933630eb705898c23
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2012-09-11 08:19:33 +02:00
Robert Loehning
394f6d2db6 Squish: Updated getConfiguredKits() 
Change-Id: I3f9dc08ce45eb773366a05de96a685a82266a54b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-07 16:08:03 +02:00
Christian Stenger
bd43956bbd Squish: Use global objects.map from inside CCOM 
Change-Id: Icc22f595f6c5c9472755e1134b7663dde7bccb86
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-06 09:42:38 +02:00
Christian Stenger
e216d43649 Squish: Substitute tilde inside toolchains 
Change-Id: Ibf0ddfa4aecaa669d843d28f83fe6d814faeb219
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-06 09:42:30 +02:00
Christian Stenger
6e1ac1aafa Squish: Use global objects.map from inside APTW 
Change-Id: Ica05af5652a3666277723e6ef9e96ecd5dc0c9f5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-05 15:26:50 +02:00
Christian Stenger
a792576a09 Squish: Fix for modified and new project template 
Change-Id: I352a7164391531b6cb48facfb83e56bfadf3c21c
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-05 15:26:38 +02:00
Christian Stenger
efa91f005b Squish: Fix for renaming Targets to Kits 
Change-Id: Ia3faec39499bc7e65d5d0a0fb7963fcb4016c6d5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-05 13:55:21 +02:00
Robert Loehning
3767ecf872 Squish: Updated class for new target name 
Change-Id: I5eca3251b290e15eaa2a462bc22f1d1ac7153834
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-04 17:13:59 +02:00
Christian Stenger
203b03f823 Squish: Fix for missing scrollArea 
Change-Id: I5419b30b8dd0cc67af4d54a3bb89edd5368cb983
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-04 16:53:28 +02:00
Christian Stenger
ac6ca18ec0 Squish: Fix tst_create_proj_wizard 
Change-Id: Ibccb5b6c1496d5ae4c9021086d55dc4236f6ac71
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-09-03 17:48:55 +02:00
Robert Loehning
a426cadeec Squish: Added Fremantle target 
Change-Id: I4c7d5a053d42693e658e82699e9339c1a72d0057
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-03 14:52:17 +02:00
Robert Loehning
b9c58161e4 Squish: Partly revert "Removal of Symbian support" 
This reverts commit ae23d50576.

Change-Id: I03cccd11022b66e90489e23ab360704ba4a357cd
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-03 12:41:27 +02:00
Robert Loehning
a37eca63b6 Squish: Added Qt Simulator target 
Change-Id: I367dc2fb71339a335700d7411465b16ec114a7eb
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-08-31 17:36:06 +02:00
Robert Loehning
c00a76bde3 Squish: Partly revert "remotelinux: rename LinuxDeviceConfiguration to LinuxDevice" 
This reverts commit 6460254931

Change-Id: Ifa0aaf19787a0d73ddf1a6d3dfe690bbfa8b4e1e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-08-30 14:19:12 +02:00
Robert Loehning
a39ad794a7 Squish: Removed workaround for closed bug 
Change-Id: I6532c7d9639d587663a204d401295d67b2310d8b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-08-30 14:18:59 +02:00
Christian Stenger
ec1fd75f7b Squish: Fix hooking into Qml project 
Change-Id: I358a6ac7acacb44f23161019d3d2a83e5d6e84cc
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-24 16:36:42 +02:00
Christian Stenger
2cd6db04bf Squish: Fix breakpoint line number 
Generated main.qml has changed.

Change-Id: I697e9346e2fc45f5c5423b2f9d9892a601a38c75
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-24 09:37:58 +02:00
Christian Stenger
f1c5b1e78d Squish: Fix __configureCustomExecutable__() 
Change-Id: I76ebec620ece569b895f381e9b35f3b257fe4852
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
 2012-08-22 16:22:28 +02:00