Commit Graph

32962 Commits

Author SHA1 Message Date
Nikolai Kosjar
756fba0dfb CppTools: Use mutex when accessing m_fileToProjectParts
projectPartFromDependencies() is also called from another thread.

Change-Id: Ic1319569d1b9b934a1be0916caa2e5bd68dce4fb
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 10:09:26 +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
Nikolai Kosjar
c2eb91e053 CppTools: Update visible documents on project update
With asynchron project managers, creating a new project from a wizard or
re-opening a session will first open the editor documents and then
provide the project information later (it's the other way around with
synchronous project managers). This sequence leave the documents with
various error diagnostics behind. Fixed by re-triggering the re-parsing.

This change does not fix QTCREATORBUG-11606 yet. Though it will trigger
a reparse with the right includes, clang still reports 'file not found'.
Will be addressed by a follow-up patch.

Task-number: QTCREATORBUG-11606
Change-Id: Ib5d251e05accf4268f9b36decc5224b2c75f610c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 10:08:00 +02:00
David Schulz
4472437beb CDB: Reverse the order of shadowed locals for newer cdbs.
The implementation have changed between the cdbs from Windows SDK 7 and 8.
Fixed it to the behavior descriped in the comment above the change.

Task-number: QTCREATORBUG-13132
Change-Id: I89aa2848b4f8f32c12daf305e7ed2ab2a7521ced
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-15 09:53:00 +02:00
David Schulz
5492dc4597 CDB: Parse version number from output.
Change-Id: I7b0624c6f1caf6a6a73e9956c91706a74e8ef0a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-15 09:52:53 +02:00
lemelisk
62ba2b76f5 CppTools: Small refactoring
Change-Id: I8975af5fe80724ead81a88a38289fe16fbb283fd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-15 09:42:19 +02:00
Thomas Hartmann
11b30a22ed QmlJS:: Allow qsTr() for .ui.qml files
Change-Id: I8ccae13653bbb010853d99be9136bf364b823c3d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 09:24:01 +02:00
Thomas Hartmann
033b711dc7 QmlJS: Adding checks for .ui.qml files
Change-Id: I88eab65e1c1187ffd5a88fb5c9780d0156a17729
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 09:23:41 +02:00
David Schulz
b4a2bd6b05 CDB: Make it possible to kill the cdb...
...when the cdb got hung up.

Handle abort like in almost any debugger engine, first kindly
ask to quit. If this doesn't work kill the debugger process.

Task-number: QTCREATORBUG-13173
Change-Id: I1ddc98b1ffe00342c96d104c16099b500e52bc07
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-15 08:19:44 +02:00
David Schulz
016d36f549 CDB: Use false instead of zero when a boolean is returned
Change-Id: I52e95cd046c49cc1b3e2e433e80a6825042372f3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-15 08:19:32 +02:00
David Schulz
3f361ee077 CDB: Remove unused variable.
Change-Id: I235b3d4c884f2f0c95eddfd5d6732f0ff306f0ed
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-15 08:11:37 +02:00
hjk
3119d93b79 VariableChooser: Rework
Allow multiple expanders to be registered for lineedits, e.g. a
local and the global ones, and actually show them.

Use a tree view in the chooser for somewhat more structured display.

Change-Id: I769f92144e5249f45e54381de52aa6973eb20118
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-15 00:49:56 +02:00
hjk
e279c7e007 MacroExpander: Allow registering local expansions
This allows a MacroExpander also to describe an expansion it can
do which was restricted to the global VariableManager only.

The global is now just a thin (unneeded) wrapper about new "standard"
functionality.

Change-Id: Ida7ca70cf3d319eae4220ea8d12f3dd1c0d4042c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-15 00:49:17 +02:00
Tobias Hunger
cd0ff57e2f JsonWizard: Replace JsFileWizard with a JsonWizard
Change-Id: I4da3485ed83fda7f17f3fa9a1f3d59bfabb7ea4d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-14 21:38:50 +02:00
Tobias Hunger
86ecc7d13e JsonWizard: Add a customizeable page
Add a way to define custom pages with checkboxes, lineedits, etc.
on it.

Change-Id: I012109eabf00a12abc67ae34514d139b7cd7cf0d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-14 21:32:03 +02:00
hjk
6b28505d53 Kit: Rename m_displayName to m_unexpandedDisplayName
That's what it is.

Change-Id: Ibd19203b30a98eb2b4b57039a8d619c031d2e5e2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-14 18:24:15 +02:00
hjk
88e4daa82b Utils: Add a base for tree like models
That kind of boiler plate comes up often enough to justify a wrapper.

Change-Id: I94aa5b1ccbe5a98f091a47087654e59e9e122c1d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-14 18:24:08 +02:00
Orgad Shaneh
1ff1b8dbfd Debugger: Remove unused values from DebuggerStartMode
Change-Id: I84ec3dea504e51bb925c925564aa9b5c84133fbf
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-14 18:19:38 +02:00
Eike Ziller
bb497cece2 Help Window: Add missing connect for contents view action
Change-Id: I4504f00d138e42453132ee7ec7513216ab9e783b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-14 17:44:05 +02:00
Eike Ziller
f4b3f20cf2 Help: Remove the now duplicate side bar code for central widget
By adding the open pages widget to the shared help widget for the mode
widget.

Change-Id: Ib2d63134d1e17356a285ad048529c50e151a2354
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-14 17:33:07 +02:00
Eike Ziller
8fcf27fd42 Help Window: Add search view to side bar
Change-Id: If3acbad9694b6d1a3441007a9fa9c13a3738aa5f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-14 17:28:38 +02:00
Eike Ziller
002093828a Help: Make it possible to duplicate search view
Change-Id: I6fac9f721fc3e2f877d9f600f9dea6650558516a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-14 17:25:31 +02:00
Thomas Hartmann
cf0f2e464f Fix compilation for msvc2012
Change-Id: I2d4d2ed7060acee1cb90f7506f3721f073f49d96
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-14 16:51:13 +02:00
Eike Ziller
020c86038c Merge "Merge remote-tracking branch 'origin/3.2'" 2014-10-14 16:28:45 +02:00
Orgad Shaneh
c884f3e0ef ProjectExplorer: Remove redundant namespace qualifications
Change-Id: Id9034e31f3f61c38894111951534dd0d59b746dc
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-14 16:22:02 +02:00
Tobias Hunger
c86ef46f6f QtSupport: Add method to query UI class name
Change-Id: Idc1cfd87415093dab4245d84797b0971ec496b45
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-14 15:49:21 +02:00
Tobias Hunger
08227991b5 QtSupport: Code cosmetics
Avoid one needless level of nesting.

Change-Id: Ied229d59eef03493041fe9e802ec71ca6e40e0a6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-14 15:48:41 +02:00
Tobias Hunger
6c64633920 QtSupport: Add missing Q_OBJECT macro
Without it this QObject is not accessible from Javascript
as it needs to be.

Change-Id: I6ffdb677cc3c986f0f95bded60f6f097b2c4f3cd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-14 15:48:33 +02:00
Thomas Hartmann
93c3ee1bbf QmlJSEditor: warn when editing .ui.qml, activate designer checks
Change-Id: I2f6d39633341bd1197d16c5c097573d4ab090896
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-14 15:38:50 +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
Ulf Hermann
10a14ced36 QmlProfiler: Increase minimum size of timeline items to 3px
One pixel wide lines are too hard to spot.

Change-Id: I94f71ba4305078d8682673618be0f5a5e1f85ba8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-14 14:55:57 +02:00
Ulf Hermann
8e7a95f0aa QmlProfiler: Pass input events with the same signal as all others
Change-Id: I1d2e4da0ffe4772acff95ec27d5459309d41aa60
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-10-14 14:55:48 +02:00
Fawzi Mohamed
419d4e4411 Add ui.qml support to code mode and editor
Change-Id: I6d818ddad1e7467578c63161c278455ef6ac743e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-14 14:46:32 +02:00
Alessandro Portale
ee9ba6a32e WelcomeScreen: Adding @2x variants for the icons
Change-Id: I50ecb0ff07c84033eaede6fd8a5dbcdc2ae5230d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-13 17:05:51 +02:00
Eike Ziller
ee9d433ca6 Fix that opening qmake projects could result in delayed first parsing
Do not set the timer interval while the timer is running.

Change-Id: If72eb77fed88a5dda3f6356b1bd82aab781b160d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-13 16:49:52 +02:00
Finn Brudal
8fe9df2697 ProjectExplorer: Fix invisible Run submenu
The Run submenu on the Project context menu was never shown.

Change-Id: I4fd29e3b7974114f094d995ef5d31f8bdbc25596
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-13 12:26:22 +02:00
hjk
df3d22ef1c Utils: Move MacroExpander to file pair of its own
Change-Id: I777accd58dafca39a0d3e50541af325277c49c6b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-13 11:51:03 +02:00
Eike Ziller
b3f3c96bca Help: Fix "Open Link" context menu item in search pane.
It selected all text in the search result widget, instead of opening the
link.

Change-Id: I264a8cc7ab29e71519d6d10b75a21fcd940d459d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:24:03 +02:00
Eike Ziller
9e74d06402 Help Window: Add contents view to side bar
Change-Id: Id690c71471ed9a61bd7a926db70e1b1fb9fac8ab
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:23:52 +02:00
Eike Ziller
2735ff4068 Help: Make it possible to create multiple content views
Change-Id: I77ccbd1b48e9611f263716a248a6193dcbad8823
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:23:29 +02:00
Eike Ziller
5cf2972345 Help: Clean up bookmarks widget
Remove unused buttons, and unify style with other views (e.g. no focus
rect on OS X) by using the common navigation tree view class.

Change-Id: I51ce1806507e45077bcbf6b8589585bb15eae712
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:21:50 +02:00
Eike Ziller
46dfd21ce5 Help Window: Add Bookmarks view
Change-Id: I8b4db5b3208c4133466fe4e61f1dd1f18b432fea
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:18:14 +02:00
Eike Ziller
85a6ea6c98 (Help)SideBar fixes
1. Get rid of the need to remember the side bar items, instead use the
IDs for activation.
2. Fix issue with empty side bar that cannot be shown, if settings exist
but contain invalid item IDs.
3. Use actual IDs instead of translated window titles for item IDs. This
requires using a different settings group to avoid issues with 2. when
going back to earlier versions of Qt Creator.

Change-Id: I1a760aa5a019db3231803af1bb72f83db49ba6b0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:17:52 +02:00
Eike Ziller
3c59cdd031 Add index and filter combo box to external help window
Change-Id: Icc815379220c55d9d7dc5d154278ba21ce2e9984
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-13 11:17:13 +02:00
Eike Ziller
286dd71a5d Navigation side bar: It is "View", not "Pane"
Change-Id: Ic6a2f953089a58a8aaa432b9edeb7f6357d527f6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-10-13 11:16:37 +02:00
hjk
cd90ddad55 TextEditor: Move some enums to namespace scope
In preparation for the final s/BaseTextEditor/TextEditor.

Change-Id: Ie18db9817ec9eec53d805443605ca55423c64c93
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-13 09:31:43 +02:00
Orgad Shaneh
86ca234004 ManhattanStyle: Reduce scope of local variable
Change-Id: Id9dcb4706934ee36972a55c73c23f046357c9512
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-12 05:04:39 +02:00
hjk
91f11d4b47 Debugger: Add an macro expander for debugger engine type
Change-Id: Ib16f3b410ea83f6a4687b03677c51fbec26165d7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-10 20:42:45 +02:00
hjk
0f29d404fd Kit: Denoise kit.cpp
Mostly namespaces.

Change-Id: Ib11a75207d20e4db1233542e7e021dab647d70a6
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-10 19:14:59 +02:00
Daniel Teske
cb068421b9 QmakeProject: Make initial parse use the async parsing
Task-number: QTCREATORBUG-12123
Change-Id: I79dcd684fe826108189db521c392c0f1d7632f88
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-10 16:30:50 +02:00