feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
72,249 Commits 108 Branches 368 Tags
ab5fdd94f334a2517510c6b51e89dbac49d561d4
Commit Graph

230 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Christian Stenger
5deb6644a4 Squish: Fix strange infinite waitFor() 
This caused WELP02 to wait forever on one testing machine although
running fine on local and other testing machines.

Change-Id: Ie66c3197f63f6f3224993107d039b0cf4b817483
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:33:18 +02:00
Eike Ziller
ef5d3796d5 Merge remote-tracking branch 'origin/2.7' into 2.8 2013-05-23 07:25:34 +02:00
Robert Loehning
f7ac7fb241 Squish: Updated createNewQmlExtension() 
Change-Id: I4739794a78fee1c347e2b63f46883f161140d360
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-17 16:35:45 +02:00
Robert Loehning
180b48003f Squish: Added copyright headers 
Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-15 13:35:01 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
 2013-05-03 09:49:28 +02:00
Robert Loehning
c8984dc58a Squish: Using progressBarWait() instead of waitForSignal() 
Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-05-02 10:13:19 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
 2013-04-30 11:43:33 +02:00
Christian Stenger
59edc40593 Squish: Add Run button to objects.map 
Change-Id: I506a030714a46a1ca3610b18daf296deaa6bfcc2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-23 16:11:37 +02:00
Eike Ziller
44931c0985 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0
 2013-04-18 09:22:19 +02:00
Robert Loehning
0a79a50d06 Squish: Fix cleanup gone wrong 
Change-Id: Iebd03914a2abcfa014288f82360687f18d6bacd9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-12 18:14:34 +02:00
Eike Ziller
9ff8979da3 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/cpptools/cppchecksymbols.h
	src/plugins/qmldesigner/components/formeditor/resizecontroller.cpp

Change-Id: I887ba071fa637ad44e39bcae581738fa078a6612
 2013-04-11 18:27:52 +02:00
Christian Stenger
c74bb8dfca Squish: Clean up 
Details:
 * removed unused functions
 * removed "QtQuickConstants" (Targets class is used for more than just Qt Quick)
 * removed Components class

Change-Id: I2908348db3e5a627d63242f9524832812822f790
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-04-10 12:15:29 +02:00
Eike Ziller
d3c979dc0f Merge remote-tracking branch 'origin/2.7' 2013-03-28 12:19:45 +01:00
Robert Loehning
d41e01696a Squish: Added Qt 5.0.1 Kit 
Change-Id: Ia5c81254de3bd2ad3537ac3a300aa2dbe0e16015
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-27 17:11:41 +01:00
Eike Ziller
599be01a67 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancesignalspy.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/qmldesigner/components/componentcore/modelnodecontextmenu_helper.cpp
	src/plugins/qmldesigner/components/debugview/debugview.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.h
	src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
	src/plugins/qmldesigner/components/integration/stackedutilitypanelcontroller.h
	src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
	src/plugins/qmldesigner/components/navigator/navigatorview.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmldesigner/designercore/include/abstractview.h
	src/plugins/qmldesigner/designercore/include/qmldesignercorelib_global.h
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
	src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
	src/plugins/qmldesigner/designercore/model/abstractview.cpp
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I9d8126e88397c02a87b5e4ab4da44e2bc7089134
 2013-03-26 13:09:43 +01:00
Robert Loehning
d3c94a6c4a Squish: Updated createProject_Qt_Console() 
Change-Id: I7c3efd967f292ce5b132eeba79e51f9aabc54501
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-25 13:56:36 +01:00
Robert Loehning
3df6756911 Squish: String update 
Change-Id: I67a597021c9af809e852e6cca02c570a5e3764e8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-03-22 10:32:42 +01:00
Christian Stenger
d101a3609c Squish: Fix hook into QtQuick and QtQuick UI 
Change-Id: I168ee74464cfc1ae9efbd69f8e0f3cb10cbbf2d4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-03-04 12:53:08 +01:00
Christian Stenger
4a78d4da3f Squish: Fix wrong signal handler call 
Change-Id: I94020e0afa85a86f5eb80fe4cf1cbb4c58edb6a6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-22 16:43:40 +01:00
Christian Stenger
b090616016 Squish: Fix tests for disabled Madde Plugin 
Part 2: Fixing evaluation of configured kits depending on available
Qt versions as well as determining supported platforms.

Additionally enable verifications for Plain C and Plain C++ projects
as well.

Change-Id: I1f92b44c6771dfc9353b911fdb1ec654c5cc591b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:57 +01:00
Christian Stenger
dae2198346 Squish: Fix tests for disabled Madde Plugin 
Part 1: Fix expected targets

Change-Id: I4acfcde6c6d347065047e91f6d65b6418aade7b3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-02-08 17:04:49 +01:00
Robert Loehning
ca4b3f9d1d Squish: Wait for parsing in createNewQtQuickApplication() 
This is what createProject_Qt_GUI() and
createProject_Qt_Console() have always done

Change-Id: Iaead1767c699e4fd237d999e6f3d94d277b1d84f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-02-08 10:30:37 +01:00
Robert Loehning
31b135a4b1 Squish: Updated opening of CMake projects 
Change-Id: Iad89199052fe8df090eb5a6257dd88de51a15a07
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-01-28 15:19:48 +01:00