feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
92,673 Commits 108 Branches 368 Tags
d3018049923823fa86b744992ec775620609e675
Commit Graph

265 Commits

Author SHA1 Message Date
Robert Loehning
c70502d691 Squish: Fix remaining WELP tests for Qt 5.5 
Change-Id: Ibe0df94d833ac2a10d43884ada3c1fe3d5de0b98
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-28 09:39:02 +00:00
Christian Stenger
029b83b8dc Squish: Fix suite_general 
Change-Id: I4e1458555a971d21e42a071e2fc0b135b0b1e91c
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-14 11:19:54 +00:00
Robert Loehning
b2ba98d988 Squish: Remove BlackBerry 
Change-Id: If79d09f44f682e8fa7ee7b71e265696ecc998337
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-14 10:54:50 +00:00
Christian Stenger
9cb59772dc Squish: QmlProjectManager is re-enabled by default 
Change-Id: I91e12547843053c5de5ab5bd1af88977e937f80e
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-09 13:53:32 +00:00
Christian Stenger
b78e3e7ff5 Squish: Fix suite_qtquick 
Change-Id: Ibafa3d9871ba95ada52a270a018ce7a5106db312
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-09 13:53:14 +00:00
Christian Stenger
cf52ab6bac Squish: First fix for createNewNonQtProject() 
Change-Id: I0c6d76f0740e8abaf7980b67156fd52388aba3eb
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-07-02 13:30:29 +00:00
Robert Loehning
96f03dc09d Squish: Update suite_SCOM 
Change-Id: I341efe4dc6440f8d8773a27a3dcc754c1151241c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-19 12:37:07 +00:00
Eike Ziller
4dd95aa5d4 Merge remote-tracking branch 'origin/3.4' 
Change-Id: Id13cbdf2f7047366e543c91fbe7c21a9c4759e56
 2015-06-17 12:04:21 +02:00
Robert Loehning
13daaaac67 Squish: Update tst_git_first_commit and tst_git_local 
Change-Id: I5e7a1c3be4fe7fab848c98abdf52d3b9af318047
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-16 16:15:23 +00:00
Robert Loehning
50c6343615 Squish: Remove outdated kit handling code 
Change-Id: I69f1b6d0d27e9330ff23de0b9d5a09ef02f353ac
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-06-16 14:44:25 +00:00
Robert Loehning
40d112d5ec Squish: Make deep copies of Targets.ALL_TARGETS 
Fixes crash in tst_generic_highlighter

Change-Id: I186cf47990e80ee6902c0812e6d6e3a260dfeec5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-31 14:37:05 +00:00
Robert Loehning
1d0582ecdb Squish: Simplify maintenance of kits 
Change-Id: I757ff8991f1f2c54789b3b536c0300e0fe643bf2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-30 13:56:20 +00:00
Robert Loehning
54438b21aa Squish: Removing Qt 4.8.0 MinGW kit 
Change-Id: Id88c715ee294e337600a5b41abd79569b11eddbf
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-03-26 13:21:45 +00:00
Robert Loehning
4413096cae Squish: Add Qt 5.4.1 kit 
Change-Id: I8efa72f8695796bd69af11e9904fae143137d1e6
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-25 14:17:54 +00:00
Robert Loehning
0352e54253 Fix copyright headers in Python files 
Change-Id: Id2c60eae52d315b8b133512d978598d1bc187b43
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-02-13 16:52:03 +00:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Christian Stenger
023eb375ca Squish: Fix creating empty qmake project 
Change-Id: I6607afde615d40a94597678665e8f30a2d6d87c6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-11-04 13:25:55 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Christian Stenger
42236fc734 Squish: Fix some tests due to latest refactorings in QC 
Refactoring of dialog wizards and editors.

Change-Id: I6604a302b04579519c78698375bc4b1027ac8b02
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-13 14:15:12 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Robert Loehning
f2b5f6a8eb Squish: Updates to keep suite_debugger running 
Change-Id: I3096289a935b654005cdc7440a87cbc527410c64
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-17 16:45:04 +02:00
Robert Loehning
7854dd33d9 Squish: Test opening of QBS project 
Change-Id: I980ad15147f419b2d42d86b2a62ebf2875a3c2d8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-01 15:23:03 +02:00
Robert Loehning
4541173535 Squish: Remove pointless waiting 
Change-Id: I1da64859bf5d6974ceacfe22d230be1983533d77
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-14 11:28:26 +02:00
Christian Stenger
ee97aeb5b0 Squish: Revive WELP03 for Squish 5.1.1+ 
Change-Id: I8c92495f3441fc8ee68e34d15f48f4021ae90f90
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-08-12 15:43:31 +02:00
Robert Loehning
ed9261733b Squish: Replace Qt 5.0 by Qt 5.3 
Change-Id: I2fb5ea259c523fce4e71f02ca087ed93fd9a0ae1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-29 18:15:05 +02:00
Robert Loehning
922f25170c Squish: Update editor tests 
Change-Id: Idcc7de48f30438b2d26512999fe8c7a785d0f3dd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-26 15:30:13 +02:00
Christian Stenger
f0a04d7ab5 Squish: Fix invocation of __verifyFileCreation__ 
Change-Id: Ib7a72de2a36e3a5d0069ca16ab054c1f1013f06c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-05-19 14:25:02 +02:00
Robert Loehning
ef38ac778c Squish: Update SpeedCrunch to 0.11 
Change-Id: I47d118f9612020d514fcb8ea3a26bf392fa41ef4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-16 14:42:46 +02:00
Robert Loehning
20c0dcfe1d Squish: Simplify __createProjectHandleQtQuickSelection__() 
Change-Id: I02f76a90aa6a464f36d84dcc70698639a74d7f86
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-15 14:24:27 +02:00
Christian Stenger
0c4b9455b6 Squish: Add test for external modification 
Additionally moved common code of tst_*_externally to project.py.

Change-Id: I056e0dc6749cf92e1416ce313a8f058639981609
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-05-09 07:39:53 +02:00
Christian Stenger
e6af796b0a Squish: Provide functions to create cpp library 
Change-Id: Iac24626801cadb28709d24f140862bb4808935df
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-05-07 12:27:50 +02:00
Robert Loehning
05339a53e9 Squish: Handle Quick UI not starting 
Happens with Creator built on Qt 4.8.5 trying to run a Qt Quick 1.1 App

Change-Id: I5f83fb26e6ac43daa9ea61af5498b81498476668
Idea-by: Christian Stenger
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-28 10:18:26 +01:00
Christian Stenger
edf7557749 Squish: Fix and improve __selectQtVersionDesktop__ 
Change-Id: I05e0038f8baf134e6d01d829bd52812b9128dd60
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-19 17:19:12 +01:00
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
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
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