feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
55,753 Commits 108 Branches 368 Tags
922c73ad675a4dc38ceff74e883e68c166da2771
Commit Graph

196 Commits

Author SHA1 Message Date
Robert Loehning
c5511de338 Squish: Remove hooking into subprocesses 
It worked well but the maintenance burden turned out to be too much.

Task-number: QTCREATORBUG-20055
Change-Id: Ic8663f808c50ca9fb17d52b6bc6c72baf7503358
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-05-02 09:51:05 +00:00
Robert Loehning
fdc4ac41d9 Squish: Replace Qt 5.3 kit with Qt 5.10 
This patch just changes the minimum for replacing the kits while
keeping the tests running. Further updates to the tests should
be done in separate patches.

Task-number: QTCREATORBUG-19440
Change-Id: I25ce60ad0a47678dba4352a4b2601ca1cdd4741d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-16 14:15:11 +00:00
Robert Loehning
a4ff3423e9 Squish: Update Qt version names and constants 
As a preparation for using Qt 5.10, these
need to handle two-digit minor versions.

Change-Id: I2a47606ee801a28df12d75323b480f8ee583893b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-01-22 12:30:49 +00:00
Robert Loehning
2427f1267f Squish: Update combos for creating projects 
Change-Id: Ibbabacc7a5e357ac765ef8629e74ca2e05505078
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-12-06 13:21:15 +00:00
Robert Loehning
89d08bf4b2 Squish: Update createNewQtQuickApplication() and calling code 
This is only meant to let the wizard finish successfully. Further
changes will be needed because of changed code in the project.

Change-Id: Ic88ffa107f15c55b3278d3d6fc4d3c2dbc4d728b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-09-13 13:17:13 +00:00
Robert Loehning
1e3b5418ea Squish: Update createNewQtQuickUI() and calling code 
Change-Id: I117afaabd0baf6074247c55b66d8d302b9dbfd34
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-09-12 09:37:59 +00:00
Robert Loehning
11abd8edf7 Squish: Replace Qt4 SDK by self-built Qt 4.8.7 
Change-Id: If990367afb01aae94755930c02c81ae82b23bb8f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-31 14:04:00 +00:00
Robert Loehning
d7f79349ed Squish: Verify project was found when adding file 
Change-Id: I313d1ba1b621d45620bf613760cefdf0a2d2341c
Task-number: QTCREATORBUG-17994
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-05-10 14:01:16 +00:00
Christian Stenger
1ffd752e02 Squish: Fix suite_qtquick 
* adapt category label to expected
* adjust to removed library wizard

Change-Id: I799882c9c7557c5d7f4c36fb4d2198f8e586b435
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-10 12:48:43 +00:00
Eike Ziller
cec29f34ea Merge remote-tracking branch 'origin/4.2' into 4.3 
Conflicts:
	doc/src/qtcreator.qdoc
	tests/system/suite_general/suite.conf

Change-Id: Ia298b177d6920a1d853e342b62cf98f7c48a278a
 2017-03-09 12:14:55 +01:00
Christian Stenger
d301824886 Squish: Adjust tests that use Qt Quick UI wizards 
Qt Quick UI had been slightly renamed and Qt Quick Controls UI is
gone.

Change-Id: I990af2bc83513ad8d85838b037e79dc88bbfdb73
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-03 12:40:38 +00:00
Robert Loehning
9c118fb8f2 Squish: Add function returning all available kits 
Change-Id: I6699ad5c869dbbd413d0b1d113a169c2ec06511c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-03 12:32:51 +00:00
Robert Loehning
f78327a571 Squish: Use list instead of bitfield for kits 
Change-Id: Ia2e1f3aa9ea723deb9f2a2c88e2f97be8ae0e833
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-03-03 12:32:36 +00:00
Christian Stenger
9423f3414b Squish: Handle build system on wizards while creating new projects 
Change-Id: I81480e5371767df0f7b4923b80cb49e00ff1c657
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-03-01 08:17:56 +00:00
Christian Stenger
9f6f5bfee2 Squish: Adapt tst_WELP02 to latest Welcome page changes 
Additionally move common used code for interacting with the
Welcome page into separate file.

Change-Id: If863ae529c7c81d095f310f0a34926b324c77fa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-13 11:58:30 +00:00
Robert Loehning
eea9090088 Squish: Remove ancient mobile kits 
Change-Id: I0bb6e2b0f61e7618a166004b418b70efa752a75f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-02 10:29:02 +00:00
Christian Stenger
43b376a738 Squish: Handle wizard check for Quick Controls 2 Application 
This wizard needs a Qt5.7 which we are not providing yet.

Change-Id: I03ba5c86835de40a44530753502f87a46554d6b3
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-11-11 11:31:49 +00:00
Robert Loehning
b729d6da7f Squish: Update tst_git_clone 
Change-Id: Ie775ae993651b51699ebfedbe6b37c823392435e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-12 11:02:49 +00:00
Robert Loehning
bde4362dad Squish: Replace Qt 5.2.1 kit with Qt 5.6.1 
Change-Id: I5865024f55a68bc2860f5b8b0b7c9c37775cc122
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-27 10:07:14 +00:00
Christian Stenger
76781b40a7 Squish: Adapt suite_qtquick to 4.1 changes 
Change-Id: Ic1d178820a3c2b6ce61f9e4fc424bc701eca87e5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-06-29 12:39:24 +00:00
Christian Stenger
1f1a9e5870 Squish: Fix expected sort order 
Change-Id: I882ad3633f7cf827aea086b5f5fd2a9204eeb482
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:07:47 +00:00
Robert Loehning
db2ab92801 Squish: Remove outdated code 
Creator can't be built with Qt 5.4 anymore.

Change-Id: Ic3c014e8384c72c10a48c65117c53daecaa683ab
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 10:25:32 +00:00
Robert Loehning
888e2cdfa9 Squish: Update opening of CMake projects 
Change-Id: I0131d43c1d7b6d835fb2e1e6c5b5a9d27825a849
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-09 14:56:57 +00:00
Eike Ziller
74cdce071f Merge remote-tracking branch 'origin/3.6' 
Conflicts:
	src/shared/qbs
	tests/manual/proparser/main.cpp

Change-Id: I13654bf10c14eb6b1d6805fe86b67ac73b2e4d75
 2016-02-24 10:08:37 +01:00
Robert Loehning
9d8e4aa922 Squish: Test overwriting of files when adding class 
Change-Id: I86ed9a3749f692fe9ead13c31e0ba62c2baa3020
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-16 13:14:35 +00:00
Eike Ziller
d18d7eaef6 Merge remote-tracking branch 'origin/3.6' 
Change-Id: I4e1ec4054d7364057c63e63e293a246e64afdddb
 2016-01-25 13:21:18 +01:00
Robert Loehning
76773763e6 Squish: Update tst_qml_editor to use Qt 5 
Change-Id: I1f2c8b9212ab2b1eec07a4587495aaf02d201523
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-21 16:48:00 +00:00
Tobias Hunger
954569387c Update License according to agreement with Free Qt Foundation 
* Update license information in tests directory

Change-Id: I311441dd37d053ca3175e44b284258e232ee93e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 16:01:06 +00:00
Robert Loehning
8abd9fae80 Squish: Update openCmakeProject() 
Change-Id: I21f5e40b2da0b2a9b37752c2f5e15c4efd687ca5
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2015-12-03 13:43:07 +00:00
Robert Loehning
9ca4648081 Squish: Replace white box code with GUI interaction 
Change-Id: I513142498768dfb3f8373d00f0b04edba0dfd06f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-10-30 10:46:53 +00:00
Robert Loehning
652ff8efeb Squish: Add test for creating new C++ class 
Task-number: QTCREATORBUG-14949
Change-Id: Ie42471f174eaacab2810eec12c2af4201a9374fe
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-01 09:44:28 +00:00
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