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

562 Commits

Author SHA1 Message Date
Christian Stenger
0143d60063 Squish: Add missing blank 
Change-Id: I476218ac334c4713718c6ad5f73c4345acc9c307
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 16:04:56 +01:00
Christian Stenger
969e6364eb Squish: Avoid crash on Mac when invoking context menus 
Again this is a hack to avoid AUT crashes when using Squish 5.0.1
with Qt Creator based on Qt5.2.

Change-Id: I34e35f3892cf3c1cffdc4985234562c1c6f0848b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 16:04:49 +01:00
Christian Stenger
b748c1b3d2 Squish: Avoid Squish crash on Mac 
Squish 5.0.1 has problems handling special locations of menus on Mac
using Qt5.2.

Change-Id: I9acc6d0f63e00815ff9ab532cb56a8ca5bb69d6a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:05:23 +01:00
Christian Stenger
f04870647f Squish: Remove workaround for fixed bug 
Change-Id: Ib6a47fbab85835fd33424134fefca153a3595d6b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:05:04 +01:00
Robert Loehning
4fd4f5d9fc Squish: Remove unused function 
Change-Id: I2860d77dcb6a571e6af0e8aff86b997c12dafc90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-03 10:42:16 +01:00
Robert Loehning
4d6cb992b1 Squish: Use generic function textUnderCursor(...) 
Change-Id: I7ea6e9af1435e716266f4dfd917fe9ac568a67a5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-03 10:41:39 +01:00
Christian Stenger
b2ff8d8795 Squish: Fix tst_create_proj_wizard 
Replace waiting for signal textChanged() and handle new Qt Quick wizards.

Change-Id: Id452703fe21b3162800671db59f722821e7dd3fa
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-29 13:56:17 +01:00
Christian Stenger
4b4e5f6990 Squish: Qt Quick [12] Application templates are merged 
Additionally there is no more a way of creating a Qt Quick application
from an existing qml file.

Change-Id: I5c1e8d26640fa3e1b865b6cc97745d64b51edc75
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-11-22 16:04:10 +01:00
Christian Stenger
393baa6a99 Squish: Provide separate settings for Mac 
Change-Id: I093bc06685e22cd91ade1d32182a1e1acaaf11fe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-10-31 16:48:57 +01:00
Robert Loehning
6578a9ba9f Squish: Fix handleDebuggerWarnings() 
Change-Id: Ib4550e82e0acfa168003f64d91bf25af62a533fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-10-25 13:47:21 +02:00
Robert Loehning
46bcfe657a Squish: Removed code using Madde plugin 
We don't have a Madde plugin anymore

Change-Id: Ic7a9fc33cdd967b642521655123c4b04158786fa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-10-24 13:35:52 +02:00
Robert Loehning
7bf30c46e9 Squish: Updates for renamed objects and dialogs 
Change-Id: If12c82f7faadab67af31400a9688aec4088d4c1e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-10-24 12:03:32 +02:00
Robert Loehning
95828d4691 Squish: Handle differences between Qt 4 and Qt 5 
Change-Id: I529d5cbd017f7d17fbe2f38fc539583e96d835cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-27 12:28:23 +02:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
 2013-09-27 10:44:32 +02:00
Robert Loehning
ee1bac2ee6 Squish: Fix verifyBuildAndRun() 
"The program has unexpectedly finished." is considered valid output,
see https://bugreports.qt-project.org/browse/QTCREATORBUG-9212

Change-Id: Ia18e2dcfccdf1bdfbbc793a01897a88c4a17eb40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 13:47:55 +02:00
Christian Stenger
5bf5eb17f1 Squish: Fix addBranchWildcardToRoot() 
Branch information is now listed in square brackets.

Change-Id: I4f38f2a93b8029ed319fae3a7c32adc0aba50660
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-20 12:47:39 +02:00
Robert Loehning
0e0d8eb7bb Squish: Update editors 
Change-Id: I022d0c5b2e025106860ea330f6b690842bb0558c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 11:54:36 +02:00
Robert Loehning
3880b805ae Squish: Fix openDocument() 
This uses the Projects view, not Open Documents

Change-Id: I8695d170ed85939ce2d002270c3cb60d97954130
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 13:13:10 +02:00
Robert Loehning
1abe32996c Squish: Fix getToolTipForViewTab() 
Shortcuts will change when order of modes changes.

Change-Id: I9ee71cefebd4f2404976a7728fd1c4b500efc0f9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 13:12:35 +02:00
Robert Loehning
b0f18491c9 Squish: Added alternative color values to tst_qml_editor 
Change-Id: I00b7df0c33fc6553fe3dc3364c6bc4dc448d72a7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 11:56:22 +02:00
Robert Loehning
876924d755 Squish: More debugging output for checkDebuggingLibrary() 
Change-Id: Iab745b8982c31a0fc53c7a2b5620816d7b491bea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-12 17:30:31 +02:00
Robert Loehning
b044f25c2b Squish: Prevent possible timing issue 
Change-Id: Ia13ae58792c73453b89b8288c5807448f7438c37
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-12 09:30:30 +02:00
Christian Stenger
fe8d426e10 Squish: Fix killing of left-overs on testing machines 
Change-Id: Ia7bbc5c1eb3d854343717349d8800a3fb14e3e20
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-06 15:00:08 +02:00
Oswald Buddenhagen
a4d714e23d Merge branch '2.8' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	tests/system/shared/project.py
	tests/system/suite_general/tst_create_proj_wizard/test.py

Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
 2013-09-06 12:20:44 +02:00
Robert Loehning
fd08c7e6e8 Squish: Fix failure message 
Change-Id: I77f46ccc87fe0ae64fcab17c35af93c6064dc9f4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-03 10:45:51 +02:00
Christian Stenger
81d9d9126f Squish: Test for debugging empty main for Qt/C/C++ 
Change-Id: I774a610b1dab5b4db4f62ff267084aad9095d3a7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-02 10:06:08 +02:00
Christian Stenger
1cecc5b0f7 Squish: Make sure current documentation is loaded 
Change-Id: I6d45ce482de3f61a14953bbb7714b1293aa2459b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-30 14:37:36 +02:00
Christian Stenger
2a2ecdc323 Squish: Prepare enabling Qt5 for suite_qtquick 
Change-Id: I7c4ac62be8f30867953f776ad56ab3ffbf6cd909
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:11:01 +02:00
Christian Stenger
2665eced9b Squish: Move common function to shared script 
Change-Id: I59d341f9f7a5c86bc3b723dbdc1e1596d464c92c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:45 +02:00
Christian Stenger
cdf8407d67 Squish: Fix determination of available targets 
Change-Id: Iff01b44058dd9175aacfb0a0da96f35fb32383e7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:32 +02:00
Christian Stenger
4fc9302c56 Squish: Move common code to shared file 
Change-Id: I5e268d6faf9a2a5a779e850667c582328c42387d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:10:14 +02:00
Christian Stenger
4c0778786b Squish: Build Qml debug lib only if necessary 
Change-Id: I90cf1f9e57d39211ea151b1cfc52e27f4ecaf654
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-29 15:09:58 +02:00
Christian Stenger
4433f7aadd Squish: Enable running on Qt5 
Change-Id: Id74f1f2162542cbac98f86bc0c0b049334cdf035
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-28 09:21:34 +02:00
Oswald Buddenhagen
c2e90c360b Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/projectexplorer/customtoolchain.cpp
	src/plugins/vcsbase/command.cpp

Change-Id: Ie7b3c9e136c0748b41320227c757471259339b48
 2013-08-21 14:39:18 +02:00
Robert Loehning
01b3e1fa54 Squish: Fix __startDebugger__() 
Change-Id: I1f87346ad12f4a6e749042b3c1bcabbc71bdbf7a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-08-21 11:01:42 +02:00
Christian Stenger
a932c6ebca Squish: Improve invokeMenuItem() 
Change-Id: I977a9465a944f30fc195e6072f50b663f5d4d24d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-08-13 09:23:34 +02:00
Oswald Buddenhagen
6896546ba5 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
 2013-07-25 13:18:31 +02:00
Robert Loehning
2001fe982b Squish: Moved code from aptw.py to build_utils 
Change-Id: Id42cc45e9cb4a8a3aa43086ae3a427143617927c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-23 15:19:17 +02:00
Robert Loehning
3897137b0a Squish: Updated tst_create_proj_wizard 
Change-Id: I04bfd317ce85f764f97d341b46b20264976ef9bd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-19 16:02:15 +02:00
Robert Loehning
8050e136e7 Squish: Added kit "Desktop 480 GCC" 
Change-Id: I20296f8819837fd613c6328d6c19fc8be82927b3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-15 12:42:18 +02:00
Robert Loehning
756222f28e Squish: Expand tests to python editor 
Change-Id: I1c3062f2802531d7a6e2f3c2b75645432ba364a4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-11 16:59:07 +02:00
Christian Stenger
97a6ee9685 Squish: Added test for checking locals 
Change-Id: I8c676982d335c772a5911cab23a52acb2a094ed1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-11 09:16:20 +02:00
Christian Stenger
702402a638 Squish: Avoid false positive warnings 
Change-Id: I6cf15b571aae9a1ba4dcd02048e7ca6b21fab1da
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-07-08 16:15:34 +02:00
Robert Loehning
6dd6ce935e Squish: Handle Squish installation path with spaces 
Change-Id: Ia988ceaeab83d3b1b5258024f9c4ee5232eaf43c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-04 15:42:50 +02:00
Robert Loehning
fbdbd11aa3 Squish: Added note about possible problems with netsh 
Change-Id: Ic54abb4d014b8eaf71cbda490e5b4206dbb3da3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-03 15:05:03 +02:00
Robert Loehning
c0272c7919 Squish: Updated used MSVC Qt versions 
Change-Id: Id44c5715c48feeeec0c10a029556c25658e70e72
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-24 12:57:30 +02:00
Robert Loehning
89225167fb Squish: Removing now unused constant defaultQtVersion 
Its use was being removed in 6078d7e028

Change-Id: Ib27d7e9a7596fc6358edc1e4a09962951d105752
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-21 18:01:25 +02:00
Robert Loehning
66a1b52f98 Squish: Stabilize progressBarWait() 
Change-Id: I9511317f8389963e5c98230d6885311a84c2dc25
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-20 14:00:53 +02:00
Robert Loehning
648403d439 Squish: Fix handleDebuggerWarnings() 
Warning now shows up for MSVC builds, too.

Change-Id: I774079fd6ee0f9bf70a7f37c9920dd45e55154d0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-06-20 13:54:04 +02:00
Christian Stenger
39103dee4f Squish: Fix WELP03 
Examples from Welcome Page can be used from Qt4 or Qt5 now and
Qt5 examples are chosen by default.

Change-Id: I2b94214b3fd12b56143ed3ea1026466ae7ffa0f3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-06-19 17:07:56 +02:00