feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
76,587 Commits 108 Branches 368 Tags
d63bfa4a2975541b51fc8173fdb06933bb9dd40d
Commit Graph

371 Commits

Author SHA1 Message Date
Robert Loehning
9ca3791e8e Squish: Fix tst_openqt_creator 
Change-Id: Ib941a9547a2af95bdf6924cfa3e9eb1a11d659da
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-17 11:54:24 +02:00
Robert Loehning
0a933a5da5 Squish: Add now stable lines back in 
This reverts commit 9af13b1f87
This reverts commit a66acf3d64

Change-Id: Ieeb222742f74482215fb089e9db6ab23b0229282
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-16 09:40:47 +02:00
Christian Stenger
bf848c498e Squish: Fix tst_rename_file 
Change-Id: Ic5aab61b2bc73f4de737b81d59fea0189893adfd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-15 20:47:51 +02: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
Robert Loehning
b446a18f98 Squish: Revert unintended change in expected files 
This table refers to the contents of v3.2.0.

Reverting change in 8295b503be

Change-Id: Ic3cd6fcf6a318745c83e871b4d9b6ae109b05813
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-09 16:32:51 +02:00
Christian Stenger
08b702758c Squish: Fix expected tree 
On Windows valgrind autotests are disabled.

Change-Id: I86323eba3d08e7ef245e1bcfbd799fce8ad29b9e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-09 14:38:02 +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
a66acf3d64 Squish: Remove further unstable lines from project tree 
Change-Id: I985fcce7297fe6508514c0476a16553905063c11
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-30 13:39:33 +02:00
Robert Loehning
9af13b1f87 Squish: Remove unstable lines from expected project tree 
Change-Id: I76bed181ec12257cf264c13660867b151d844747
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-30 09:40:31 +02:00
Christian Stenger
149f420550 Squish: Fix tst_tasks_handling 
Change-Id: I58a818864b495d1ecf2923abd50cf848ba368195
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-09-23 07:16:58 +02:00
Robert Loehning
1f3d7c9e61 Squish: Include new Qt Quick templates 
Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-05 12:27:12 +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
14fe8f07cd Squish: Update Creator's sources to v3.2.0 
Change-Id: I224da43ad46acfce33fb62926df62c211164ed40
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-26 11:20:29 +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
Christian Stenger
f5474a35e5 Squish: Fix detection of expected debuggers on Linux and Mac 
Change-Id: Ie3f1c291e9ba4646fb948bf30d38d8db9af31886
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-22 08:02:26 +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
Christian Stenger
e39b623c28 Squish: Fix tst_create_proj_wizard 
Change-Id: Ia34a9055aac52479a331f3c85557291b1c586221
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-02 13:43:39 +02:00
Christian Stenger
93b53a4bb3 Squish: Add expected paths for 64bit debuggers on Win 
Change-Id: Id3f80097c38d6578ef647bb2d31aedad0f2a56dc
Reviewed-by: David Schulz <david.schulz@digia.com>
 2014-06-30 09:05:56 +02:00
Christian Stenger
7a86928fbc Squish: Fix getEditorForFileSuffix() and simpleFileName()... 
...when using filenames coming from Squish's treeview syntax.

Change-Id: I0296dbabb09af11dde5ed4716b1b1f48f05c47e1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-06-04 15:12:50 +02:00
Robert Loehning
7b327c30b8 Squish: Update Creator's sources to v3.1.0 
Change-Id: If00f643c9080262121ed582fb428e27cc709e421
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-26 13:17:05 +02:00
Robert Loehning
e2de42a705 Squish: Replacing some usages of len() 
Change-Id: Icaf029043fed149bff6e15861fdcc6d640a2ecfc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-23 14:58:37 +02:00
Christian Stenger
f1fb669b5b Squish: Add test for tasks handling 
Change-Id: Ib45ac05c3aed4659e0777725e46a7a8c5dacc19e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-05-23 12:56:56 +02:00
Robert Loehning
c229093b1d Squish: Test project tree of CMake project 
Change-Id: I91fb9cea7cad22f9c7d3874be95ecdc42f18b358
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-22 16:17:29 +02:00
Robert Loehning
8db19a850e Squish: Fix regexes in tst_openqt_creator 
Change-Id: I6117291866f7b25f6749e533d9adecfc66842711
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-22 16:16:56 +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
Robert Loehning
ca9a316cfd Squish: Test automatic saving of files before build 
Task-number: QTCREATORBUG-12014
Change-Id: I20080ac89d63c1d0a00cb18b31f5539bf2b4a554
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-04-30 15:29:20 +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
1b6b0b9506 Squish: Stabilize tst_default_settings on Mac 
This also reverts 1605b788e6.

Change-Id: I45b1b856eb6bd0acba43a10866faf2a9726aaa54
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-20 15:43:10 +01:00
Christian Stenger
1605b788e6 Squish: Handle sporadic missing visibility on Mac 
Change-Id: I7e2694ced72ee836ad6c532f642914d802acb0c2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-18 12:14:00 +01:00
Christian Stenger
03fd61ff08 Squish: Fix tst_rename_file 
Change-Id: I71eece2ce9d73132edc09c5ba1465882636f5c78
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-11 15:42:46 +01:00
Christian Stenger
e2b8ef4592 Squish: Avoid Squish crash in tst_rename_file on Mac 
Change-Id: I51b16970504d85eed63cf0ddd7b0ff07b6226273
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-10 16:03:35 +01:00
Christian Stenger
1b7de8c37c Squish: Fix detection of clang++ on Mac 
Change-Id: I02f68f7942a3774c686e1482d275e22a6037af2a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-10 16:03:27 +01:00
Christian Stenger
888d752392 Squish: Support Debugging Tools for x86 as well 
Change-Id: Ibf508de48473a48d0a88356d15a06088873a3d9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-03 11:43:56 +01:00
Robert Loehning
c8027974ca Squish: Update expected project tree 
Including revert of d67b7229da

Change-Id: I5712739385b4e08b494f6915cd4fc43928653e04
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-28 11:39:11 +01:00
Christian Stenger
139a1a8dbe Squish: Fix tst_rename_file 
Change-Id: Ic8c7aac5133b3df32b25188c1ab325a985cc3d42
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-27 12:27:55 +01: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
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
e574e1eae0 Squish: Fix tst_default_settings 
Script error was introduced in d26f01fdbc.

Change-Id: Ifafcf41822fe0f3ad5ab5a3b507d54c7c314bdc3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-17 14:14:11 +01:00
Robert Loehning
d67b7229da Squish: Update expected project tree 
Change-Id: I01b6d8206a753e43970bc5a32010ddaefe862537
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-13 13:25:24 +01:00
Christian Stenger
d26f01fdbc Squish: Skip non-executable debuggers 
Change-Id: Ibdcd4c01e2393ad34115764e1babf810a7f09053
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-13 13:06:15 +01:00
Christian Stenger
aed01c76d7 Squish: Support different lldb versions on Linux 
Change-Id: I7af39d335c7025dc29ac6cc718089977450a541c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-11 12:46:27 +01:00
Christian Stenger
650d8710cb Squish: Do not rely on default installation path 
Change-Id: Iac5d45b3cbdb5ecb18d971b37189b27164abbaf3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-05 08:55:05 +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
4b6d04d63b Squish: Fix tst_rename_file on Mac 
Change-Id: Idca881989a673d3f220379d3a233c851ee75e248
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-17 16:37:51 +01:00
Christian Stenger
38ce2b78ba Squish: Fix tst_default_settings for Mac 
lldb from Xcode is recognized as well.

Change-Id: I4c79b5362ced38461aa4f823d4e303093f81fcac
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-17 15:50:35 +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
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