feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
65,448 Commits 108 Branches 368 Tags
d65ef60ea24a25e636f5a51b51192abbc883da12
Commit Graph

46 Commits

Author SHA1 Message Date
Robert Loehning
f830a21bf8 Squish: Update tst_git_local 
This doesn't run into QTCREATORBUG-11074 anymore, because
Creator now uses "git add --intent-to-add" when adding files.

Change-Id: I125ff29f9974efad5d22fed220f6155cc5c6804b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-08-18 13:09:08 +00:00
Robert Loehning
0575e1bbc2 Squish: Fix finding commit 
Change-Id: I87d2345babe91c449c20aec8c93dbafee5773d4f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-06-11 16:22:43 +00:00
Christian Stenger
7c669a06be Squish: Adapt to changed ui 
Change-Id: Ibad3b2080040f7345125c549527f22f2c246fbef
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2020-06-11 13:44:24 +00:00
Robert Loehning
da558f3376 Squish: Don't close files before exiting Creator 
It's not needed and it's fragile since
the menu item is disabled at times.

Change-Id: I0c72c5072374462d99740e7eaa752f91e019c6ee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2020-04-02 09:46:19 +00:00
Christian Stenger
e8727fcae2 Squish: Clean up single (left) mouse clicks on items or objects 
Do no more use pixels as offset if we can handle this without.
Clicking on items by using an (x, y) offset will likely fail if
running on a machine with a different DPI setting.

Change-Id: I0e5a4985104bd1d68aadf8c5534583fa1b048edb
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2019-07-25 12:06:05 +00:00
Robert Loehning
0b5d60db53 Squish: Update tst_git_local 
Change-Id: If3b3eb69a7927d0ecbc5d10afee6ab3fdfbd448b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2019-06-27 12:40:15 +00:00
Christian Stenger
f9b8f1471f Squish: Fix expected file content 
Change-Id: Ie47b63593e5fae203fdf329ede46d425f27cf735
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2019-02-14 14:04:03 +00:00
Christian Stenger
d0e4f657c9 Squish: Adapt tst_git_local 
Committing has been made a 'bit less synchronous'.
So, wait a short amount of time to have the expected
output present, but fail if it does not appear within
that time frame.

Change-Id: I5f6c02dcec42800e876a4bae36e08596bedf0049
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-12-11 12:45:05 +00:00
Christian Stenger
1016dc0603 Squish: Refactor starting Qt Creator from Squish 
Change-Id: I7cbce7db2a22a7cb327965b9b7918eb46266b260
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2018-09-05 09:24:18 +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
b1239d6c4c Squish: Remove outdated workaround 
This reverts commit dbfbe1d65d.

Task-number: QTCREATORBUG-19523
Change-Id: I443c1bbed42f9aa96593b66a6b135bd6df35447d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-01-09 10:12:17 +00:00
Robert Loehning
dbfbe1d65d Squish: Rename project while this triggers bug 
Task-number: QTCREATORBUG-19523
Change-Id: I468c5fe0af07b1875b45de8a1fd32da23208f6a0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2018-01-03 10:16:37 +00:00
Christian Stenger
b7c8818eb9 Squish: Update expected texts 
Change-Id: I0959635cdfe92335c0a5582119e145c8e7ea88b2
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-08-01 09:33:54 +00:00
Robert Loehning
8637d04c1d Squish: Update expected text in tst_git_local 
Change-Id: I97a532f80b9dc2b40ec5931116b207cfaeef8f4b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-07-11 09:20:27 +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
Robert Loehning
d10b9390c8 Squish: Update tst_git_local 
Format of .pro file changed slightly

Change-Id: I026057ecc76c082ddac06e81b36c0b3b62629da0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-05-08 09:15:27 +00:00
Robert Loehning
3b9f1659eb Squish: Update type of VCS log 
Change-Id: Ia7359be2061a752a3e6957405b0150cd604b3bc7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-03-11 10:08:40 +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
62fae6b6c2 Squish: Test clicking on unknown git commit id 
Task-number: QTCREATORBUG-15051
Change-Id: I9046fe8279a661a5ba28bd14747a9ee9915c3416
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2016-01-21 12:42:25 +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
a80f4d179b Squish: Verify shown filenames when adding C++ files 
Change-Id: I1e6c944a70c4f44d4f1b3e5cb7b6b6c8421ba453
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-09-01 09:44:41 +00:00
Robert Loehning
e34148ba75 Squish: Update tst_git_local 
Change-Id: I26a0e497382a602e99811e77a7f1b5cebc57a946
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-07-14 08:30:39 +00: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
Eike Ziller
45e544b442 Merge remote-tracking branch 'origin/3.3' 
Change-Id: I79fac4a4e8535153da1b3f73a6b1caad1513ea9c
 2015-02-16 12:35:54 +01: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
033a628cdc Squish: Updates for renamed template 
Change-Id: Ic5a3fad69d8fb2875b7578cb58c8f3203678531a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-02-13 12:37:10 +00:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Robert Loehning
98f2a74f90 Squish: Update tst_git_local 
Change-Id: I4bc64ad82bddf448b6846fe3a75941741c32a24a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-30 10:05:06 +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
Eike Ziller
df3176d5e3 Merge remote-tracking branch 'origin/3.3' 2015-01-14 16:06:46 +01:00
Robert Loehning
6e2782b8b0 Squish: Test first commit in git repo 
Task-number: QTCREATORBUG-12755
Change-Id: Idf27f4bc19ec62ce10ca9367e0b32b8d2b031587
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2015-01-09 12:16:21 +01:00
Christian Stenger
949a86f035 Squish: Fix tst_git_local 
Change-Id: I6acdaaf81a0b8c2523df4fda4ee7ec044da25678
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-15 15:24:30 +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
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
4c45e43916 Squish: Updates to keep suite_tools running 
Change-Id: Idb7a4c70c26aaf105ba2023d126fbc0f9f992e9e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-18 11:01:05 +02:00
Robert Loehning
5d40776037 Squish: Don't expect branches in "git show" 
List of branches was disabled becaused it needed too long.
This feature might return in master

Change-Id: I065f2843f5b7328e0208e5bdcb7663dc8f8873fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-25 17:26:49 +01:00
Robert Loehning
b071a0ad07 Squish: Update tst_git_clone 
Command line information appears in Version Control view,
not in the dialog anymore.

Task-number: QTCREATORBUG-10531

Change-Id: Ib3a501e32d6105a78d8e4f4f1ad019de22e3ef3b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-03-13 19:23:51 +01:00
Christian Stenger
a85f64a7c6 Squish: Fix DiffEditor related object types 
Change-Id: I295dc127a11e10496d441438feb7d1b8e15994b6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-02-18 18:46:38 +01:00
Christian Stenger
076f6e690f Squish: Enter dummy values if committer info is missing 
Change-Id: Ic97de439b994a359cb0eae977cd0ec3cb780b081
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-29 14:50:13 +01:00
Christian Stenger
fc6b4f6cd4 Squish: Avoid soft links in path for tst_git_local 
Change-Id: I3217ef41e9539b671cd9398cc268f2adf622ea6f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-29 11:22:48 +01:00
Robert Loehning
540fa4b726 Squish: Stabilize tst_git_local 
Change-Id: Icc0f3ae2f4702398bbbc46b309b23ffe69daf778
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-01-23 14:05:07 +01:00
Christian Stenger
7312733452 Squish: Extend tst_git_local 
Change-Id: I4160e3f8e7f43f9711b3436693aeb3b333208faf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-01-20 13:41:55 +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
a0fdad9921 Squish: Added further git log tests 
Change-Id: I28a1922fa1cf256baf3775d6eab47aeeb35432df
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2013-12-18 12:32:24 +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