feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,241 Commits 108 Branches 368 Tags
c20c20f01277d1d0f7e452ee6ad7fd5f2bc34f3d
Commit Graph

442 Commits

Author SHA1 Message Date
Christian Stenger
521bb9156e Squish: Use Qt5.2.1 kit if possible 
Change-Id: I674c100e12c5553c2cee36ea2d78ba4e6f61a299
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-05 16:40:35 +01:00
Sergio Ahumada
c375436847 Fix some typos 
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-03-05 09:39:42 +01:00
Robert Loehning
23e9338e97 Squish: Enable QML debugging in doSimpleDebugging() 
Change-Id: I46a902a8038beac49e70a8a1f422c079bd2b3f44
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-28 15:34:48 +01:00
Christian Stenger
ae781b1919 Squish: Update Qt Quick tests to reflect new available versions 
Change-Id: I60d4b2ca64825101358774a4e04cceb3040fc630
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-19 14:38:55 +01:00
Christian Stenger
e7297926ef Squish: Update objects after merging BaseValidatingEdit... 
...into FancyLineEdit.

Change-Id: I7e45861783a7bdf160827595b4e455d869884c81
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:18 +01:00
Christian Stenger
48770e5785 Squish: Remove gdb debugging helper stuff 
Change-Id: Ib437d65da31546c8705b64d5ab320f7a7e226bc7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-17 14:50:12 +01:00
Christian Stenger
12b0fedcfc Squish: Do not crash on fail in getEditorForFileSuffix() 
Change-Id: I3d3519e2bb203e52afd2785aac46997616b4ca4b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-13 16:21:14 +01:00
Robert Loehning
6a8dc025d5 Squish: Update objects moved from Find::Internal 
Change-Id: Icc34cdcf6b6fc5aa08f10b1cad4306ce666d21dc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-13 13:37:22 +01:00
Christian Stenger
207d3f9a3a Squish: Fix running hooked subprocess on Mac 
Change-Id: Ib7879aab6227758373023d0164edfc6f10f0e23c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-31 09:02:47 +01:00
Christian Stenger
06d34f5a12 Squish: Unify hack for invoking context menu items on Mac 
Change-Id: I7e4d1cb00ea75e1aa33fa20b30744ffd56f002de
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-29 13:50:57 +01:00
Christian Stenger
8087db30a3 Squish: Do not invoke Exit on AUT inside helper functions 
Quitting the AUT should always be reserved for the main function
of a test case.

Change-Id: I1a90e7c1e327cde37280e9d3130b30216798382c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-28 12:22:38 +01:00
Christian Stenger
cc28865b53 Squish: Fix hook-into issue on Windows 
Change-Id: I45ec21c6a7a0c5e34e72226fbb442f0ab681fa4d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-24 15:39:34 +01:00
Christian Stenger
7f4c9a19f2 Squish: Unify invoking add custom executable 
Change-Id: If090ca16a9cc358ff38de5564d2e8ef2a2cf8200
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-24 11:12:10 +01:00
Christian Stenger
1cdb5d87c2 Squish: Update Qt Quick hooking stuff... 
...to differentiate between Qt Quick 1 and Qt Quick 2 when using
no additional function on the subprocess.

Change-Id: Ia345a1503128be0c5b81a010c438009bf41d93b5
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-23 11:05:09 +01:00
Robert Loehning
52bff97cfa Squish: Replaced lot of signal code by one simple function 
Change-Id: Idb6b663a8b2be217d8769fab5e2f6f9290f37990
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-22 10:13:02 +01:00
Christian Stenger
fb114e3882 Squish: Fix condition in project.py 
This error was introduced in 0f04c2b3b0.

Change-Id: Ifdaa18d4267daff1e59c5ced3cfc188beb4c52c9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-21 23:10:00 +01:00
Christian Stenger
9f81e79c8f Squish: Fix issue with menu invocation on Mac 
Squish 5 has problems to handle menus on Mac for Qt5.2 builds.

Change-Id: I533f8fcd2c8a2786ae354cd92e92efad0fb1dd57
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-21 10:44:09 +01:00
Robert Loehning
82fdd52e82 Squish: Wait for parsing in __configureCustomExecutable__() 
Change-Id: I798a29aa9a4676edd1493f4973d29f8725e117e5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-21 10:40:29 +01:00
Robert Loehning
0f04c2b3b0 Squish: Eliminate another signal handler 
Change-Id: I6f89d908366257ab2dbd5d0a48f77f41e131ae12
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-20 13:13:55 +01:00
Christian Stenger
f710048c92 Squish: Add workaround to avoid AUT crash on Mac 
The crash was actually only in tst_SCOM05 as WELP suite is
completely disabled.

Change-Id: I32d9bef43dc50eb8d3c71a5b1d6e7894c7d74276
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-17 16:14:38 +01:00
Christian Stenger
49db5bfa52 Squish: Add workaround for native file dialogs on Win 
Current Squish fails to hook into native file dialogs for
Qt5 builds. The workaround forces Qt Creator to use QFileDialog.

Change-Id: I3a28314bab54178d93cda85c0a36e9202f037c9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-09 08:58:46 +01:00
Robert Loehning
ffbdbc855c Squish: Give subprocess some seconds to quit 
Change-Id: I83ca568b88537fca189425de1795b82eaca66105
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-08 10:54:49 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
Robert Loehning
f5ec3f4237 Squish: Make some variables local 
Change-Id: I1687ae59c6327616ee18f6120dca9d0d0ce40bcf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-07 15:24:57 +01:00
Robert Loehning
85f1a0310c Squish: Simplify runAndCloseApp() 
- remove one signal handler
- make one variable local

Change-Id: Idff589c243cbd324b1b37478d77f28446d23490b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-06 17:15:21 +01:00
Christian Stenger
d787e4e2ab Squish: Enhance tst_default_settings 
Change-Id: I150d4d53a6e6e93749f9cdbfe33971633805573a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-06 14:23:35 +01:00
Robert Loehning
5e42856947 Squish: Fix bug in selectBuildConfig() 
Function did not wait when configName did not
change, even when the active kit did change.

Change-Id: Ia0954ee7da45864aefe88ad1919124c065af2ac1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-19 11:39:03 +01:00
Robert Loehning
7bccc61f5e Squish: Use native separators in srcPath 
Change-Id: I6e307d08ccb47436e3d47aa40c9f8373a80df5ce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-16 11:27:41 +01:00
Robert Loehning
5cddad9d9b Squish: Added test for local git actions 
Change-Id: I4b7cd2e872d6a9aed95d3802d9df98ffdce2cbfe
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-13 16:22:56 +01:00
Robert Loehning
cdf5c36f64 Squish: Let ensureChecked() handle tristate checkboxes 
Change-Id: Iecb18400512ec6525757b442cf3b984d22302009
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-12 16:45:00 +01:00
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