feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
54,723 Commits 108 Branches 368 Tags
41df91ece8e2d88fabbaf00b2074b810ba93b51a
Commit Graph

4883 Commits

Author SHA1 Message Date
hjk
bf9a3b2020 Debugger: Fix LLDB reference display for LLDB 320.x 
There is seemingly still no proper API for that, and
the old hack broke. Use a new one.

Change-Id: I9e638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-28 14:55:03 +01:00
Nikolai Kosjar
2fc4acbc35 CppEditor: Avoid duplicate "Add #include XYZ" 
Task-number: QTCREATORBUG-13422
Change-Id: I3648bf44760fdac4e8e1e79652519136af6032c8
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2014-11-28 14:01:10 +01:00
hjk
315fb0372e Debugger: Add more reference related autotests 
Change-Id: Iae638ca1fbd84c43c7d31b65e017792d1b6a1e0b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-28 12:48:28 +01:00
hjk
9f272bcb8c Debugger: Also output dumper location in LLDB auto test 
Change-Id: I51a017ced91198bdc4e822cfcc1c45580945a773
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-27 07:09:34 +01:00
Eike Ziller
938326ef2c Merge remote-tracking branch 'origin/3.3' 2014-11-26 11:11:46 +01:00
hjk
42fc31bff7 Debugger: Require some clang version for clang specific test 
Change-Id: Ib6ba0ffb5957a60e700abd9a540bd7bbf5888b2a
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-25 13:02:24 +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
hjk
1a1ec50801 Debugger: Adjust std::vector<bool> dumper autotest for recent Clang 
Change-Id: I1998f0750c5905a3dc4e83db297edc135cd2a39a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-21 15:12:11 +01:00
hjk
20675704c6 Debugger: Add ability to check for clang version in tests 
Change-Id: Ie56de7a0e59cadd8557f7a2fd00d434470000f3c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
 2014-11-21 15:12:04 +01:00
Ulf Hermann
10d942e268 QmlProfiler: Split AbstractTimelineModel in two classes 
We need a general purpose TimelineModel and a specialized
QmlProfilerTimelineModel.

Change-Id: I2da02d65efa11e160cab5fa9f8a21075beb0e2bf
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:03:58 +01:00
Ulf Hermann
af84726c51 QmlProfiler: fix autotest 
Change-Id: Ibe5e7638eb7f3d88ed02e6de12b81c9b2aba3e7d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 14:03:49 +01:00
Ulf Hermann
91cb52d40b QmlProfiler: Require model manager when constructing timeline models 
This relieves us of the headaches created by figuring out what should
happen if the model manager is changed later. Extension models can be
safely created through a factory.

Change-Id: I8cf8fd6d639e4e6c9da66351ea44cfc35fd614a5
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2014-11-21 10:54:29 +01:00
Christian Stenger
dbf663198c Test: Fix valgrind auto test 
Change-Id: I6ea9f4d174170b9e430ea77b2337dfdb9971c13c
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-20 12:26:18 +01:00
Nikolai Kosjar
beac7b9539 C++: Fix highlighting after "invalid code" 
For the semantic info document we do not expand function like macros and
because of that certain macro invocations lead to invalid code that we
need to handle, e.g.:

	Q_GLOBAL_STATIC(CppTools::SymbolFinder, symbolFinder)
	class Foo {};

This change makes parsing Foo in the semantic info document successfully
again, which affects highlighting of that class.

Change-Id: I389265ac64d3f0b8b8f406d38fa58d78820b14ba
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
 2014-11-19 16:10:56 +01:00
Christian Stenger
cd8dc3ae12 Tests: Fix tst_fileutils for Qt5.4+ 
Change-Id: I65b4eb8dff91c69bff50c63cd42a4894df0470f0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-11-18 14:43:22 +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
Eike Ziller
2d03b59f53 Merge remote-tracking branch 'origin/3.3' 
Change-Id: I0ab4982e229d475b8e3575414b4bebbfea07498d
 2014-11-12 12:55:10 +01:00
Nikolai Kosjar
69504c25ca C++: Document::functionAt provides line information 
Needed for the debugger.

Change-Id: I6465f6dc53017df212e403ea8a9a1c7977ac1671
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-12 12:29:51 +01:00
Nikolai Kosjar
cefd1832ce C++: Include class name for inline functions in functionAt 
The code that constructed the fully qualified name used
enclosingNamespace() which skips classes.

Use LookupContext::fullyQualifiedName() instead.

Change-Id: Ic03a91c0fe120c52dc69f3e78e82a574458d8314
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-11 11:50:46 +01:00
Nikolai Kosjar
079e7a500f C++: Tests: Make document_functionAt data driven 
Change-Id: I8e811b21c584e7b6a2b8eb61830cb680f6fefa95
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-11 11:23:13 +01:00
Christian Kandeler
9d677e3302 qbs build: Remove unneeded import statements. 
The respective items are available without it.

Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
 2014-11-10 15:45:14 +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
Orgad Shaneh
e871225057 C++: Add a failing test for pp concat bug 
Task-number: QTCREATORBUG-13219
Change-Id: I6278d7977f0ce560e793838c90cfbc867e1af025
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2014-11-07 08:52:31 +01:00
Orgad Shaneh
b4112d7806 Tests: Fix compilation 
Broken by ca151d07fa.

Change-Id: Ic6b58b5749d5811d1250840c81d692837e9a2cea
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
 2014-11-07 08:18:28 +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
f44aee5da0 Debugger: Make simple test compile with old Qt and MSVC 
Change-Id: Ibef0886f059a4807af9ad0e7922b37835da75efb
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-11-03 10:56:48 +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
Thomas Hartmann
b5140d760e Update manual tests for ui split 
Changing some files to .ui.qml and extracting call to Qt.fontFamilies()

Change-Id: I6151fd088ba4ff8c2cbd9299bacb534639b0b18c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
 2014-10-16 15:07:51 +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
9c7019f0b2 License update. 
Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-15 15:19:55 +02:00
Nikolai Kosjar
390b4f0e0b C++: Fix parsing of "Foo *foo = new Foo()" 
It should be parsed as an DeclarationStatement, but instead it was
parsed as an ExpressionStatement.

Regression introduced with

    commit d3c5fff66d.
    C++: Fix expensive parsing of expressions

The introduced ASTCache did not save the correct return value of a
parse* function. Because of that, the first return in
Parser::parseExpressionList returned false on the second invocation
(cache hit), instead of true, which resulted in an ExpressionStatement.

Task-number: QTCREATORBUG-13122
Change-Id: I8dbd8852b0909edddcd3195b484f4cea92328cc5
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
 2014-10-15 10:08:19 +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
hjk
e43af30faa Debugger: Add auto test for QVarLengthArray dumper 
Change-Id: I25af89bea8fe7781ae6b1b21fd294753f8519ee6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-14 22:15:15 +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