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

1016 Commits

Author SHA1 Message Date
Eike Ziller
b5b47f7df2 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d
 2015-01-08 10:38:20 +01:00
Eike Ziller
487b05dba8 Adapt bugtracker URL 
Change-Id: I93a256f18e720edb0bcfc2b409c119abfdcf2a2b
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
 2014-12-19 10:18:23 +01:00
Christian Stenger
f515a2528e Squish: Enable QmlProjectManager plugin for tst_qtquick_creation3 
Change-Id: Idaa2a603f5945a4df249f9b6ce606769a5c7ea74
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-16 07:19:39 +01:00
Robert Loehning
1be459d9dc Squish: Avoid error in tst_build_speedcrunch 
Change-Id: I2f199f392016005b8e00e48253838370628875d9
Task-number: QTCREATORBUG-13700
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-15 16:25:04 +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
541d00453a Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp
	src/shared/qbs

Change-Id: I6d91042bb48314d00be721099aed19feca74e0ce
 2014-12-10 13:20:02 +01:00
Robert Loehning
5ff6bbd4cd Squish: Test auto variables in tst_memberoperator 
Change-Id: I7b5bbdcfbd685abb5a716cc237276761065eb962
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-12-05 11:17:40 +01:00
Christian Stenger
64d6d64c93 Squish: Let test continue instead of crashing on protocol error 
Change-Id: I3c862d26fbbdf124c0b347225cfd97e0748a0830
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-12-03 12:09:29 +01:00
Eike Ziller
a47fbb8309 Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp
	src/plugins/coreplugin/themesettingswidget.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.h
	src/plugins/qmlprofiler/qml/Overview.js
	src/shared/qbs

Change-Id: Ibe92c166fc5bfbcb4d6964e50ca7298d8459d60e
 2014-11-24 15:43:48 +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
8871f0b36b Squish: Wait even longer for indexing docs 
Change-Id: I69a09389d4ecc8fefea96311ea8144dbc4f838e2
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-17 13:26:42 +01:00
Robert Loehning
3c3ded74fe Squish: Wait longer for indexing docs 
Seems to timeout frequently on Windows test machine.

Change-Id: I07827555d1c5044a37e708051704644995fe4b17
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-11-13 12:51:25 +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
b5478c994c Squish: Fix tst_git_local 
UI for committing files has changed.

Change-Id: I452e1e7f1bd4a976d8fb0a3a98927ddbfb372213
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
 2014-11-10 13:24:44 +01:00
Christian Stenger
48a90eea3c Squish: Remove Squish 4 from mapping file 
Change-Id: I3b81e5389462a688c6da5c2a1a0ed7a38ecc833a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-11-06 07:51:27 +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
Eike Ziller
cd5e00034d Help: Fix highlighting of search terms. 
It was using the wrong search help engine to get the search terms.
Instead let the search widget itself figure out the search terms, and
pass it directly on to the help widget when activating links.

Change-Id: Ib72220eafca69e92894fe7584b1e4dfd9a42cc7e
Task-number: QTCREATORBUG-13239
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-11-04 07:57:08 +01:00
Robert Loehning
335ada73c4 Squish: Expect missing manual 
Change-Id: I296d492ea79512ac73dfec4d86743b1203ee9631
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-31 14:52:12 +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
Robert Loehning
065594174a Squish: Expect no highlighting in help 
Task-number: QTCREATORBUG-13239
Change-Id: Id2e7340b0ed8baa8dff1e1dbbfb45a1219c12a63
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-30 15:00:22 +01:00
Robert Loehning
5a58c4080a Squish: Test renaming of includes 
Change-Id: I0c3d64ae6339ff41fc742b67618efbf69998c64e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 13:57:30 +01:00
Robert Loehning
bdbab9274c Squish: Wait for C++-parsing in tst_rename_file 
Change-Id: I66a12ae685e6980bb9d41a1a177afc2bfa46ca98
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 11:48:52 +01:00
Robert Loehning
80f865c057 Squish: Test more templates 
Change-Id: Ia9d5afc621b4e79417f6aa1b64b6b9d9f7b5f38a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-28 11:27:08 +01:00
Robert Loehning
0172dde1a6 Squish: Update object 
Change-Id: I94b8d4e66982a365c5a8ae5c6a7429a1cb2d9c45
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-22 13:52:19 +02:00
Robert Loehning
08a56e7506 Squish: Remove Windows-only files from expected tree 
Change-Id: I3043f613ba2bbafe1e6b32013be5e59cc1da412c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-22 13:31:29 +02:00
Robert Loehning
e8a0d1783a Squish: No need to enable qbs explicitly 
It's enabled by default now.

Change-Id: Ifdc51efbe8d075e839885296746ab5dc3faa1140
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-21 15:40:35 +02:00
Robert Loehning
b02f8f27fb Squish: Fix tst_openqt_creator 
Change-Id: Idfcf63cf7b783b033a8e09e5a8661e86ae4cc3b9
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-21 15:40:04 +02:00
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
Christian Stenger
2a4b7fc8de Squish: Fix tst_external_sort 
Forgot this one in 42236fc734.

Change-Id: I4f7c7b654dd266e6f131a31a5ca3bdc34bcf2f8f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
 2014-10-15 07:19:29 +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
Robert Loehning
e2456cf8cf Squish: Update object for tst_modify_readonly 
Change-Id: I45814f0e7d7e719c4ea73de658e44bd0e7c17d9a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-14 15:17:54 +02:00
Alessandro Portale
087d1f5cd5 Update URL to the Qt Account page 
It moved to https://account.qt.io

Change-Id: I54df8eb37d06d2ab5f4d6c3bb489fbdd7d3e5229
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-14 12:23:28 +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
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
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
Robert Loehning
061392e08c Squish: Improve README 
Change-Id: Id9270613c4760e02af55afc070972a92da56c130
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-13 12:11:37 +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
Robert Loehning
674b1369da Squish: Stabilize tst_CSUP03 
Change-Id: Id90b102d926c90e53c3a8a610ac464cb6876dc5d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-09 15:40:32 +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
ba793f02a6 Squish: Refactor and improve tst_CSUP01 
Change-Id: I154ebcc01a870b0bf3912a69b37184fd2f37092a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-10-02 13:09:03 +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
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
bacf4f0afb Squish: Do not crash tst_simple_debug if debugger can't stop 
Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-26 15:42:30 +02:00
Robert Loehning
a4321bbfe1 Squish: Run tst_memberoperator with Clang code model, too 
Change-Id: I3b4b2ed3523e94d5a6dee6957b5b16d4092122fd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:09:12 +02:00
Robert Loehning
ea93a6531c Squish: Run tst_CSUP05 with Clang code model, too 
Change-Id: Ief81ba27d8cbd43de5ef9c71b586da8cc372a8bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:03:20 +02:00
Robert Loehning
6447eb9cbf Squish: Run tst_CSUP04 with Clang code model, too 
Change-Id: I3a2f029e0f1c85ecbd3c161b097f4e975014f714
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2014-09-25 16:02:38 +02:00