feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,369 Commits 108 Branches 368 Tags
42c68ad7b51a809e25c8493c221a7ca730c9539d
Commit Graph

33 Commits

Author SHA1 Message Date
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
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
Eike Ziller
1704c484a8 Merge remote-tracking branch 'origin/4.2' 
Change-Id: I9006dd493707ae626ae3502541599c8789e1aab0
 2017-02-27 15:17:37 +01:00
Robert Loehning
126a031ee2 Squish: Wait a second in checkNavigator() 
Change-Id: I45bad30e28f7374ae10d5b0155e08d8297f44448
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-27 11:01:44 +00:00
Christian Stenger
ed67e7121b Squish: Fix tst_session_handling 
Adapt to changed UI and Welcome page.

Change-Id: I413835926411687d6161026da42be97b2b6a41c3
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-24 06:27:55 +00:00
Robert Loehning
bd8c12c94c Squish: Update tst_session_handling again 
Someone removed the numbers again.
This reverts commit 816d0010c2.
Also, the sessionList was replaced.

Change-Id: I23e135e5b240321e30097c0d1d48c82cb24b6c49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-13 09:19:34 +00:00
Robert Loehning
816d0010c2 Squish: Update tst_session_handling for numbered sessions 
Change-Id: I2821f55440e13eeb9ca81589ffd746e713ae0e16
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-10-10 10:36:19 +00:00
Orgad Shaneh
1b34f2a4b8 Merge remote-tracking branch 'origin/4.1' 
Change-Id: Ia90424d479936a898705c433e5810c77ae088b2c
 2016-07-22 15:18:00 +03:00
Robert Loehning
75e47e03e3 Squish: Use examples from Qt 5 in tst_session_handling 
Change-Id: I038f04b4c6243dfb37516560ca23001d854c1a4f
Task-number: QTCREATORBUG-15469
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-18 13:59:49 +00:00
Robert Loehning
c8e83d0adb Squish: Remove outdated version check 
To build Creator, you need Qt 5.6 at least.
To test Qt 5.6 you need Squish 6 at least.

Change-Id: I5b4c08da64df749961544c25f3ed691ff56d2cc0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-13 11:10:02 +00:00
Robert Loehning
483fcb6ab7 Squish: Update object in tst_session_handling 
Change-Id: Ia1f327cf2a69e74d242bf4ad7d7ed8cfd7cd3a34
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-31 13:35:15 +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
e71cb3ae62 Squish: Update expected sizes of project tree in tst_session_handling 
Directories in resource files are now displayed as
separate items, adding two more entries to the tree.

Change-Id: I398469bfe7680c73ab0440fdb9dc6f75e101f2f4
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-22 10:21:11 +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
84952c5a96 Squish: Fix tst_session_handling for Qt 5.5 
Change-Id: I9347656c659055472cdda42fe07348c07bc3037e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-28 13:48:37 +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
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
Robert Loehning
07a52d1ae6 Squish: Remove Qt4 compatibility code 
Thank you Qt4 for all the good times we had together.
Farewell.

Change-Id: If0e81b71a97524bb0c84ea5bbcba4c29244a0a5e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-31 14:52:03 +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
135a0dfb0e Squish: Fix Welcome page related tests 
Change-Id: Ifbec46c6e695835f9d88d298823e8793ed428409
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-13 14:15:24 +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
Christian Stenger
9b89379745 Squish: Revive WELP01 for Squish 5.1.1+ 
Change-Id: I1d1bc9334fe6c0fc1187b9bcde27d0b4ed3081b4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-28 14:50:41 +02:00
Robert Loehning
95d22fc972 Squish: Revive testing of Welcome mode 
This partly reverts commit a1274c93c8.

Change-Id: I1ba8586ae51a42a2239ee4ae5c8ead2ac880ecfa
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-22 15:03:27 +02:00
Robert Loehning
d07ee6a3d1 Squish: Update tst_session_handling 
Change-Id: I93fe52e59579958c85ecbe086f62ec067af214f7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-18 14:02:42 +02:00
Robert Loehning
dc66a01b10 Squish: Configure old Qt Quick projects with Qt 4 
Change-Id: I3a891ba8a3ca5d437c114a95fb1620a200261301
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-02 13:58:54 +02:00
Christian Stenger
b8a1807542 Squish: Fix tst_session_handling 
Change-Id: I85348bffe6c24be4663f67fc62e95a3e663b828c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-27 12:20:27 +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
147e01eb9f Squish: Update tst_session_handling 
Change-Id: Iac27111fe5cf41acfc78dd5534583f7a27712c3a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-11-04 13:09:46 +01:00
Robert Loehning
a1274c93c8 Squish: Temporarily disable testing of Welcome mode 
Change-Id: I9d8764d11298094c302ae3c979e3bbc23ec68e20
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-11-01 10:22:16 +01: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
Robert Loehning
e29ae8c537 Squish: Fix usages of :OpenDocuments_Widget 
Change-Id: I1dde01e3fc8fb5f696054f72c44bdc9387aad5c6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 16:00:19 +02:00
Christian Stenger
70709f7670 Squish: Added test for session handling 
Change-Id: Ie177c4f86bb09e14c26babf63127d48871c09cfb
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-05-23 17:33:10 +02:00