feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
44,951 Commits 108 Branches 368 Tags
fd83c50599b52d0fa07901b7709d0ad6f562e0c0
Commit Graph

499 Commits

Author SHA1 Message Date
Robert Loehning
cddd19239d Squish: Waiting for "Cancel" button to come and go 
Same concept as in progressBarWait()

Change-Id: Ic8e21663f7b0831c79e440dc4aa76237dc814e5d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-18 11:10:29 +01:00
Robert Loehning
fdb91f5135 Squish: Wait for search results consistently 
Change-Id: I956bf543505c5391a78325070b72e3affc5133a6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-11-13 12:50:02 +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
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
ebf03a5f33 Squish: Don't use deprecated function when having a Qt5 build 
Change-Id: I8717bda9c4a24effe36a80e689829e93539186c6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-14 08:22:42 +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
Eike Ziller
d008779bf7 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
 2014-09-29 13:40:53 +02:00
Robert Loehning
4d8002a973 Squish: Add shared file for clang-related code 
Change-Id: I2eaa39afbfeb0031f191ce9adead80c0d0960542
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:00:50 +02:00
Robert Loehning
98c3a1c331 Squish: Update getEditorForFileSuffix() 
Change-Id: Ib052d2dd655117492cbb26f03eaa63c8b61466bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-18 11:00:40 +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
742db5115c Squish: Use small letters in shortcuts 
Following Squish documentation. Capital letters even caused
problems in nativeType().

Change-Id: I902984da40c7b57c1c40d35c2cd183e95481f1cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-18 15:20:27 +02:00
Robert Loehning
8c133689be Squish: Stabilize selectFromCombo 
I keep losing the second mouseClick in tst_create_proj_wizard...

Change-Id: I45f37c848c7eccd9fd59c455e8d6c80c6de88c06
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-15 13:46:24 +02:00
Robert Loehning
7e92419175 Squish: Fix hack for tests opening multiple files 
Change-Id: I35ff3e1cf99a8e5f171f0728f05a3b828da78293
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-14 11:34:57 +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
Robert Loehning
646dcf0eea Squish: Hack when "Open File" dialog can't be found 
Happens to me with binary packages for Linux.

Change-Id: I688103ba2df26056468e89271e815b5717effeee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-12 16:39:47 +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
b2682fee22 Squish: Remove workaround 
Just doing as the great wise frog tells me.

Change-Id: I73c07142cd902ac3b89f8c00597087d7d550a2ee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-08-01 14:31:39 +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
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
Christian Stenger
194f22c577 Squish: Add temporary workaround 
Without this workaround the build machines are messed up with lots of
exception handler windows.

Task-number: QTCREATORBUG-12644
Change-Id: I2075e85559314813b272cc6dbe7f068954b8c9dd
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-07-10 15:54:56 +02:00
Christian Stenger
c40dc7674d Squish: Raise timeout to avoid LookupError 
Change-Id: Ia1718e67682623a6323411a8ad7e9240eb328bfb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-07-02 12:53:54 +02:00
Christian Stenger
cf211e46cf Squish: Fix expected object 
Change-Id: I49eef9de0c635cd6618d05e0618ce6b0fe8d352e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-30 11:05:53 +02:00
Robert Loehning
1d8c2e61b4 Squish: Update getQtInformationForBuildSettings() 
Change-Id: I54df50a31bd1bc937668870e86666156ecddb6ce
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-27 13:27:47 +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
Eike Ziller
2786250c17 Merge remote-tracking branch 'origin/3.1' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
 2014-06-13 10:51:51 +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
Christian Stenger
d455f5f6dc Squish: Stabilize tests using getEditorForFileSuffix() 
This is especially useful when switching between files assigned to
the same type of editor. (e.g. cpp header <-> cpp source)

Change-Id: I0179e7086a6f25cb0ecc0b69da1f61adb21d8ac2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-06-03 16:46:46 +02:00
Robert Loehning
e167864063 Squish: Avoid pointless waiting and warning in selectBuildConfig() 
Change-Id: Ia092d7e7f9af78c23512fa193635ff52fead822d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-03 14:57:34 +02:00
Robert Loehning
74649b7bb5 Squish: Update handling of HelpViewer 
Change-Id: I5b0b3e4d6c7e1e9e72ac0265bc4bfb276561e247
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-02 16:24:57 +02:00
Robert Loehning
a74dc14e67 Squish: Use dumpIndices() 
Change-Id: Iecfaec20c54014b361268947145f80409103388e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-06-02 15:21:53 +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
Robert Loehning
6f6dbe23b8 Squish: Optimization in checkLastBuild() 
Change-Id: Id706efcf25e39d55a80ebfcd2ed0212c7f1a2324
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-22 12:00:11 +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
b8df93134d Squish: Using param instead of global var in checkLastBuild() 
Change-Id: I9c7af050f9ff211cd5025fe5421449dcdee04f53
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-16 15:23:48 +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
556ec551d7 Squish: Selecting right config in verifyBuildConfig 
...by just calling selectBuildConfig.

Change-Id: I8f07b3d874c22ebeca8e5cf658d754cf231c7ad0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-15 12:17:31 +02:00
Robert Loehning
372fc953cd Squish: Fix createTasksFile() 
Change-Id: I437d9e59723556363e233e939032630246981874
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-05-09 16:04:15 +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
Christian Stenger
0ee8704930 Squish: Throw fatal on empty task 
Change-Id: I815810ffbe295cabf37e8a14000243481b799800
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-05-06 12:13:10 +02:00
Christian Stenger
4b2cc015f8 Squish: Make sure correct output panes are used 
We expect the first five toggle buttons for output panes to be visible
by default. Additionally added buttons will have the property 'occurrences'
with a value depending on their position - not their label. Using the menubar
for these additional output panes is safer.

Change-Id: Ie58f8dd56ec35bfa9f6bba871aa807e4b1507c75
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-30 15:45:02 +02:00
Christian Stenger
7b6da4b7f2 Squish: Fix verifyEnabled() 
If verifyEnabled() was used with an object's real name it failed due
to using invalid syntax.

Change-Id: Ie88ffbda3ab1601fbd781955146b6600ba5104a3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-29 15:27:47 +02:00
Christian Stenger
0369e2a114 Squish: Remove workaround 
QTCREATORBUG-11548 has a quick fix now.

Change-Id: Ia9f38f58bf5d11d5ece4779fd7527fbf8ae65fb1
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-04-04 12:18:00 +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
Robert Loehning
9759d3bacb Squish: Fix modifyRunSettingsForHookIntoQtQuickUI for multiple kits 
Change-Id: I3d42920edba4a750c27714d26c9143e48c17fd39
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-28 10:18:06 +01:00
Christian Stenger
e0aa74dc1a Squish: Improve workaround for tst_QMLS04 
Change-Id: I2be9ac44e02287362e7aeab4927645fbbcf38c64
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-26 21:20:06 +01:00