Commit Graph

38410 Commits

Author SHA1 Message Date
Ulf Hermann
bb517a645e QmlProfiler: Show notes in overview
Change-Id: Ie24c2c01a978640bd2925265385ff7c7b3274a41
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 11:22:44 +02:00
Ulf Hermann
bac3b888fc QmlProfiler: Show note indication in category labels
Change-Id: I9bcb9bcaab6d24c87c932fce610a6026461a5ecb
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 11:22:37 +02:00
Ulf Hermann
a466a3eb55 QmlProfiler: show notes in range details
Change-Id: Iaee0c3488e3eaa2c347e8533d57b16e47d1a9328
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 11:22:26 +02:00
Sebastian Sauer
97c955a323 Add QmlPrototypeReference::document() getter
Enable access to the private Document
instance in the same way its done
already in the ASTObjectValue class
by adding a const getter.

Change-Id: I0581e527bb766fc72682f2e38d0d8d52d4452deb
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 11:16:18 +02:00
Thomas Hartmann
9367ad36be Allow multiple '.' for a suffix in MimeTypeData
(e.g. ".ui.qml")

Change-Id: I476585649f02651eeb99564417ec46de6346c67d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-15 11:10:41 +02:00
Tobias Hunger
4579b7c59e MacroExpander: Add variables for date and time
The expander is used in the wizards, and being able to specify
timestamps is something many people requested at devdays.

Change-Id: If227f9c48d0b5f409d22233af8c43ae376f343f9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-15 10:52:33 +02:00
Ulf Hermann
ac6b699ea2 QmlProfiler: Draw notes in timeline
Change-Id: Iec56b43877521081ee0080648054be2b5898dbdd
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 10:34:15 +02:00
Ulf Hermann
3b5380def8 QmlProfiler: save and load notes
Change-Id: Id566bdd2c2a00b886779e04efbda5b49ed87a85d
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 10:34:05 +02:00
Ulf Hermann
350615cc71 QmlProfiler: Add special model for notes
Change-Id: Ia0acbc5e0a02563cf497594b67a5f7a67488fb79
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2014-10-15 10:33:38 +02:00
Nikolai Kosjar
0c107b33d1 CppTools: Do not re-use semantic document if dependencies changed
Changes from the current editor snapshot to the previous one represent
dependency changes (include paths, defines, ...) for the document. Use
this to stop the semantic info updater from re-using the previous
document for highlighthing.

Task-number: QTCREATORBUG-12267
Change-Id: I91308700122ded7c458c267b685c00b966874a64
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-15 10:33:27 +02:00
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
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
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
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
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
65ebdc7e03 Debugger: Fix recent typo in putSimpleCharArray
The joys of scripting languages without compile time checks.

Change-Id: Ic9405d549f3e60d5b834350fa3bce1d4d4609747
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-14 21:09:50 +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
d7105cc245 Wizard for ui.qml file based project.
Change-Id: Id0f61efce0ae47c28eb2f5fbcee5468dc5c339ca
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-14 17:18:48 +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
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
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
65aef999ce WelcomeScreen: Fix font differences in "Projects" tab
Task-number: QTCREATORBUG-13165
Change-Id: I6ee42792e374d2a80c24871421bcf99ebecab719
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-14 14:09:50 +02:00
Thomas Hartmann
5847f325e9 Manual tests for UI split
This adds a couple of projects for testing the ui split.

Change-Id: I9056702e724541a43895f28453ce31516a348e70
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-14 13:26:34 +02:00