feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
57,704 Commits 108 Branches 368 Tags
2a8c48cb15d50b8686e5cb4f29a96f4431a0ec37
Commit Graph

86 Commits

Author SHA1 Message Date
Christian Stenger
6cdcae528d Squish: Ensure text cursor has safe position 
When re-opening a file that had been opened and closed inside
the current active session we open the file at the last used
editor position.
Provide a function to explicitly jump to the first line of an
editor.

Change-Id: I0602d8ef46e80a20385fd1b205812776d6666326
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-11-02 12:02:42 +00:00
Robert Loehning
2c6a57be9c Squish: Move imports of "os", "re" and "sys" into shared class 
Change-Id: I349cb255b8fa6f96e32d5dacb3c9b58ddeb76897
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-07 09:25:05 +00:00
Robert Loehning
ff10f8c3a5 Squish: Fix warnings 
Warnings from static code checks, that is, not test.warning() at runtime.

Change-Id: I651d13491106583908059ecdb5f700f539b6d9c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-08-06 14:21:30 +00:00
Robert Loehning
9e6fe45ad9 Squish: Fix for Qt 5.11 
The items in the treeView look slightly different than
with Qt 5.10 and thus seem to lose the mouseclicks.

Change-Id: Ibee1abdbc9e9bfe622b45f76ed5e612e81fd1770
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-07-02 09:10:58 +00:00
Robert Loehning
1aed2b06de Squish: Stabilize tst_CSUP04 
Change-Id: I2e036e401253f1f2cfe29efdbeedf9a51491d0ef
Task-number: QTCREATORBUG-20140
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-04-04 13:27:00 +00:00
Christian Stenger
c4ec04d254 Squish: Adapt QMLS suite to changed template 
Change-Id: I43fcb9a47759025c4da2d2fba75c4fa05d1dc340
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-10-18 04:55:20 +00:00
Robert Loehning
5f7636254a Squish: Store text of item as early as possible 
It seems that item.text can change after (not during!) the
double-click. Storing it earlier to workaround this problem.

Change-Id: I5da4ae7ea8e19b945e56349c2236940a9e5731cb
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-09-01 05:04:19 +00:00
Robert Loehning
ba1036fd46 Squish: Fix searching for filename in windowTitle 
Currently, only the end of a filename as actually
compared since the title also contains "filename.h"
when the title starts with "otherfilename.h"

Change-Id: I60dd4dc1fd7c53fee2ddbc44953bcfe4d75c7530
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-08-30 12:27:37 +00:00
Christian Stenger
d93af8c90f Squish: Add special menu handling for macOS 
When sub menus are going to get triggered the mouse
interaction done by Squish might close the sub menu
with the mouse click - avoid this by explicitly
setting the mouse cursor onto the item before
clicking it.

Change-Id: Id2afe9823304caac1bd66a423fe4a0ee12993ddd
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-08-07 10:05:53 +00:00
Robert Loehning
84907a7d65 Squish: Fix __handeColorTips__ for Qt >= 5.8 
Explicitly selecting the right overloading for setNamedColor

Change-Id: Id5aad47ec84b672d70f393456054d4cd779b7a21
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-06-01 09:09:36 +00:00
Robert Loehning
062678a937 Squish: Add some debug logging to openDocument() 
Change-Id: If34eaad1bd04a7d2409f0e00c217c7bd12add106
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-21 10:49:37 +00:00
Christian Stenger
3adef3cc7c Squish: Remove OSX specific workaround 
Change-Id: I9e43c47c5ef2422d46e10b9f2fd88454b4352c30
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-09-30 10:09:10 +00:00
Robert Loehning
c8150dc918 Squish: Click again when hitting scroll bar in openDocument() 
Change-Id: Iae5256c894fbd4fcb8b93fd5b6dbe7b56b428982
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2016-07-01 09:19:10 +00:00
Christian Stenger
2b57a1afa6 Squish: Fix handling of context menu on OSX 
Change-Id: I6f5d50eca0199826e8af0f11016a1dfeb924f046
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2016-05-26 13:31:25 +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
692261564f Squish: Include binary editor in tests 
Change-Id: I0b4fc4e0cb18dcbd569ebdba201bfb9e2596ba5b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-02-15 10:44:47 +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
506c0685a3 Squish: Avoid menu problems with Squish 6.0.0 
Change-Id: I43219d36f07e2b5636f84f891f94220148f4dd7f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-09 10:27:26 +00:00
Robert Loehning
02b521a8ff Squish: Fix reading tooltips in tst_qml_editor 
Change-Id: Ie65752d2c8c87c3802c810b98ffe7b122549c762
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-04-02 13:09:03 +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
Robert Loehning
26972ade65 Squish: Stabilize tst_qml_editor 
Avoid false fails with Squish 5.1.3 and Qt 5.4.0 on Windows

Change-Id: I4d330627ed7d93ad7e327aebd9c9d3173e34a8e1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-02 14:22:54 +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
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
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
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
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
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
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
b442a02602 Squish: Generalize stabilization of tst_CSUP04 
Change-Id: Id56420161cc80acc4057a56f62af5d33acf2eef7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-19 17:20:48 +01:00
Robert Loehning
9d97880037 Squish: Trying to stabilize tst_CSUP04 on Mac 
Looking at the screenshots, fails might be timing issues.

Change-Id: Ia17b766e332370b3392161d79c774d94f3c1b790
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-17 16:22:20 +01:00
Christian Stenger
8f61967587 Squish: Fix openDocument() for new qrc approach 
Change-Id: Ib0809955339b97de7000d015830e4d13c3d66b62
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-03-07 13:50:45 +01:00
Christian Stenger
12b0fedcfc Squish: Do not crash on fail in getEditorForFileSuffix() 
Change-Id: I3d3519e2bb203e52afd2785aac46997616b4ca4b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-13 16:21:14 +01:00
Robert Loehning
6a8dc025d5 Squish: Update objects moved from Find::Internal 
Change-Id: Icc34cdcf6b6fc5aa08f10b1cad4306ce666d21dc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-02-13 13:37:22 +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
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
969e6364eb Squish: Avoid crash on Mac when invoking context menus 
Again this is a hack to avoid AUT crashes when using Squish 5.0.1
with Qt Creator based on Qt5.2.

Change-Id: I34e35f3892cf3c1cffdc4985234562c1c6f0848b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 16:04:49 +01:00
Christian Stenger
f04870647f Squish: Remove workaround for fixed bug 
Change-Id: Ib6a47fbab85835fd33424134fefca153a3595d6b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-12-12 13:05:04 +01:00
Eike Ziller
63ff745213 Merge remote-tracking branch 'origin/2.8' 
Conflicts:
	src/libs/extensionsystem/pluginmanager.cpp
	src/libs/extensionsystem/pluginspec.cpp
	src/plugins/coreplugin/basefilewizard.cpp
	src/plugins/coreplugin/coreplugin.pro
	src/plugins/coreplugin/coreplugin.qbs
	src/plugins/coreplugin/editormanager/ieditor.cpp
	src/plugins/coreplugin/externaltool.cpp
	src/plugins/coreplugin/icore.cpp
	src/plugins/cpptools/cppmodelmanager.cpp
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/find/ifindfilter.cpp
	src/plugins/projectexplorer/buildstep.cpp
	src/plugins/projectexplorer/devicesupport/idevice.cpp
	src/plugins/projectexplorer/runconfiguration.cpp
	src/plugins/vcsbase/vcsbaseeditor.cpp
	tests/system/suite_debugger/tst_simple_analyze/test.py

Change-Id: I11dc9e60bfc14bad4f8af747d041fc7678a07c17
 2013-09-27 10:44:32 +02:00
Christian Stenger
5bf5eb17f1 Squish: Fix addBranchWildcardToRoot() 
Branch information is now listed in square brackets.

Change-Id: I4f38f2a93b8029ed319fae3a7c32adc0aba50660
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2013-09-20 12:47:39 +02:00
Robert Loehning
0e0d8eb7bb Squish: Update editors 
Change-Id: I022d0c5b2e025106860ea330f6b690842bb0558c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-20 11:54:36 +02:00
Robert Loehning
3880b805ae Squish: Fix openDocument() 
This uses the Projects view, not Open Documents

Change-Id: I8695d170ed85939ce2d002270c3cb60d97954130
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 13:13:10 +02:00
Robert Loehning
b0f18491c9 Squish: Added alternative color values to tst_qml_editor 
Change-Id: I00b7df0c33fc6553fe3dc3364c6bc4dc448d72a7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-18 11:56:22 +02:00
Robert Loehning
fd08c7e6e8 Squish: Fix failure message 
Change-Id: I77f46ccc87fe0ae64fcab17c35af93c6064dc9f4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-09-03 10:45:51 +02:00
Robert Loehning
756222f28e Squish: Expand tests to python editor 
Change-Id: I1c3062f2802531d7a6e2f3c2b75645432ba364a4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-07-11 16:59:07 +02:00