Commit Graph

31174 Commits

Author SHA1 Message Date
Marco Bubke
0dd5f68152 QmlDesigner: Rename actualState in currentState
Change-Id: I49f80126a3fc0184a3b18352ed2adc24e50040c7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:37:29 +02:00
Marco Bubke
c3be93f23c QmlDesigner: Refactor QmlItemNode::createQmlItemNodeFromImage
Change-Id: I1fa0eb94d36ae48bb131da2ceca75e19a4175a4d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:37:22 +02:00
Marco Bubke
1c3e9e01d1 QmlDesigner: Rename hasInstanceForNode to hasInstanceForModelNode
Change-Id: Ia66160505a7b899f9e1b436df5584ce5b42bea9f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:22:54 +02:00
Marco Bubke
282de65774 QmlDesigner: Rename hasDefaultProperty to hasDefaultPropertyName
hasDefaultProperty sounded like the property existed in the model not
in the meta info system.

Change-Id: Iaa670f10b9d6d6038fbc3a4224250ed821407af4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:22:38 +02:00
Marco Bubke
4d3c15f87b QmlDesigner: Add defaultNodeAbstractProperty
Change-Id: Iebdb0604f02034a18a13b631ab553a84fccbc8ae
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:22:11 +02:00
Marco Bubke
99b9299f16 QmlDesigner: Refactor QmlModelState
Change-Id: Idd1aac53bafda25a2334fdd84b064f1204755764
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:21:32 +02:00
Marco Bubke
8143031599 QmlDesigner: Remove QmlModelView
And use NodeInstanceView directly. There is still more cleanup required
for the view handling.

Change-Id: I62417644ceefb25fb9f3bb93a894b71ae0929cb0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:21:20 +02:00
Marco Bubke
a6c43c63c2 QmlDesigner: Remove rootQmlItemNode
Change-Id: I5a3ae428b210d1f09d8a3239fe56d887f92dac4c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 16:05:50 +02:00
Marco Bubke
8e54a2a58d QmlDesigner: Move states functions from QmlModelView to StatesEditorView
Change-Id: I1ac99fbf805b21823e062749bd3342be1641072a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 15:04:15 +02:00
Orgad Shaneh
905aeeadcc Bookmarks: Handle enter and delete keys
Change-Id: I169dcc02f02a647b0a2ae6478227a852be922de2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-31 14:56:02 +02:00
Nikolai Kosjar
fdaddec7d1 CppTools: Clean up CppModelManager(Interface)
* Const correctness
* Better variable names
* Sort order of includes and forward declarations
* Comment fixes
* Cosmetic/Whitespace changes

Change-Id: Ieb137266ac7eddedb00c37f8b2cc8677d67e4bdd
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-07-31 14:34:08 +02:00
Przemyslaw Gorszkowski
f068223133 C++: fix tooltip for constantValue of enumeratorDeclaration
E.g.:
enum E { x = 1 + 2 + 1 };

constantValue for enumeratorDeclaration currently is equal: '1+2+1'
(spaces between are removed).
Fixed version produces "1 + 2 + 1".

Change-Id: I38f7703bd5c856c28aadeecd7f7923aa4a7da422
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-31 14:14:39 +02:00
Marco Bubke
fe39e8e9c3 QmlDesigner: Refactor QmlItemNode::createQmlItemNode
Change-Id: Ic3f5db354cce4fd992008fa89aa4748254ea290e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 14:10:57 +02:00
Marco Bubke
237d173160 QmlDesigner: Rename instanceForNode in instanceForModelNode
Change-Id: I182d5b557f5770816059897e746709d054ecac51
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 13:12:54 +02:00
Marco Bubke
b756be03ae QmlDesigner: Remove instanceForModelNode functions
Use directly the NodeInstanceView

Change-Id: I8e4da4fa9e130fe62db178df6a0b60e9bda01a86
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 13:12:22 +02:00
Marco Bubke
9343583f6a QmlDesigner: Move createQmlState to QmlModelState
Change-Id: I8e88bd6f3a97e09f2325a28be975352ccd48a909
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 13:02:08 +02:00
Marco Bubke
1fd9707dbb QmlDesigner: Remove QmlModelView::createQmlItemNode functions
Change-Id: I5c3f05beec22f056daa3419fac40ef837a655a8d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 12:12:21 +02:00
Marco Bubke
125eb66b79 QmlDesigner: Move generateNewId to AbstractView
Change-Id: I8753eae6c4f79967822003709e7cd35dbea4eeba
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 12:12:14 +02:00
Marco Bubke
a63732e3e0 QmlDesigner: Move creation method from QmlModelView to QmlItemNode
Change-Id: I087c4d6652d4f57e3c7682176e79253c0e378809
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 12:12:07 +02:00
Marco Bubke
b91a46ede6 QmlDesigner: Move majorQtQuickVersion from ModelNode to AbstractView
It has nothing to do with a ModelNode

Change-Id: I5fd6afd42be8db9e6ac17de9df8777c8f286a9c2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:45:23 +02:00
Tobias Hunger
96ba1dd4a7 Use proper way of looking for system Qt
Change-Id: I770a15c653c6b25d10a919f6c6dbefdb79c17d89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-31 11:29:14 +02:00
Tobias Hunger
f69da8e770 Fix some memory leaks.
Change-Id: Iba9d32aacbfe11d9542f629fca0571998b4fadfb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-31 11:28:40 +02:00
Orgad Shaneh
6b8c93637b VCS: Un-data functions that accept QString
Change-Id: Iffa82f4ab06162ab57e77301e77fb37ed7230bd5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-31 11:23:00 +02:00
Marco Bubke
706d0a821e QmlDesigner: Refactor layout functions
Change-Id: If95aead7d922511e4f1b3abdee38f4c403da37a5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:21:46 +02:00
Nikolai Kosjar
ef59179100 CppTools: Tests: Refactor / Clean up cppcompletion_test.cpp
* Open the files in the cpp editor, so preprocessing will take place
* Remove duplicated code
* Fix coding styles issues

Change-Id: Ic8bffcbc5a4ac5aca76bc55880d33c3b55f0944c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-07-31 11:21:45 +02:00
Michal Klocek
197d4a155f Minor. Fixing storing of gdb binary paths in profile.xml
* keeps paths in form of C:/.../.../... on windows
* instead of C:\..\..\..\

Change-Id: I5d645ab136c92fbdd5f9750265213ba974fac38a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-31 11:21:11 +02:00
Marco Bubke
e24d3cc831 QmlDesigner: Remove notifier from QmlModelView
Change-Id: Ieee0fc5fc95832d6976f0c1397e0261164f317c3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:15:57 +02:00
Marco Bubke
444bc6c986 QmlDesigner: Add hasDefaultNodeAbstracProperty to ModelNode
Change-Id: I421686cdc9faf2a9dadad3162cfbfc6793ab3caf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:15:48 +02:00
Marco Bubke
d7402bfff3 QmlDesigner: Refactor allQmlItemsRecursive
Change-Id: If8b98e008e59de1eae87108a3256005fd85981b9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:15:24 +02:00
Marco Bubke
877f9081cc QmlDesigner: Add more selection functions in SelectionContext
It is much smarter to use the view functions instead of generating the whole
list and pick the first item or ask if the list is empty.

Change-Id: Ifcd40784ddab75c505b5f7f2dfc7b11cbd11c69d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:13:02 +02:00
Marco Bubke
4b3e3aaa71 QmlDesigner: Remove operator from properties
To improve the readability of the source methods should be used.

Change-Id: I839e448369a03dc42b3649baed033daa20c4d49a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-31 11:12:52 +02:00
Nikolai Kosjar
8d283ffd16 CppTools: Hide "QPrivateSignal" on signal completion (Qt5)
See also http://woboq.com/blog/how-qt-signals-slots-work-part2-qt5.html

Task-number: QTCREATORBUG-8540
Change-Id: Iccad837d7a0da982e7d7a1eda95ff1828cf1dce6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-31 10:21:14 +02:00
Aurindam Jana
f12a864488 Analyzer: Remove duplicate Analyzer run configuration aspects
QML Profiler does not make use of the run configuration aspect.
Return the run configuration aspect for only Valgrind.

Regression introduced in Ic8279755f0188ab53253a62322fcccf1c17b6aaf

Change-Id: I568e309e72f7e7f0107bd720acc9dbbda78acfc1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-30 17:18:40 +02:00
hjk
a5fa89145c QmlProfiler: Remove unused class member
Change-Id: I67b27bbe541054feec6642b6906360f99cdb5297
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-07-30 16:59:24 +02:00
hjk
62677a2b5d QmlProfiler: Remove unused members from QmlProfilerEnginePrivate
Change-Id: I597f214f3c7c912acc137f2fb453836ee712720b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-07-30 16:58:52 +02:00
David Kaspar
bd064d50e6 Qnx: Fixing UI freeze when canceling SSH-keys generation
The UI freeze happens when an user cancels 'Add BlackBerry Device' wizard
while SSH-keys are being generated.

Removing a need for terminate() and wait() calls in
BlackBerryDeviceConfigurationWizardSshKeyPage dtor by invoking a new
thread each time a Generate button is pressed. Such a thread can delete
itself later when the calculation is finished.
The only drawback is that the calculation is still happening even when the
wizard is closed. Just the calculation results are not used anywhere.

Task-number: QTCREATORBUG-9888

Change-Id: Ibc5e98d08e129d7f76620a5dea9ed5190932243b
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-30 15:03:11 +02:00
Aurindam Jana
05c6a5724f Revert back copyright headers
The copyright was changed in
Ic8279755f0188ab53253a62322fcccf1c17b6aaf

Change-Id: If4251d13b6e653d49913d1c50044177491326edc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-30 14:25:45 +02:00
Aurindam Jana
02fef59c0f Analyzer: Remove duplicate Analyzer run configuration aspects
QML Profiler does not make use of the run configuration aspect.
Return the run configuration aspect for only Valgrind.

Regression introduced in Ic8279755f0188ab53253a62322fcccf1c17b6aaf

Change-Id: I568e309e72f7e7f0107bd720acc9dbbda78acfc1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-30 13:48:45 +02:00
El Mehdi Fekari
8d6e995c82 Qnx: update the bbnk-env parser for internal NDKs
In recent internal NDK versions (10.2) some new
environment variables are introduced (they are evaluated
when soucring the bbnk-script) that QNX_TARGET and QNX_HOST
are depending on.

This patch is a workaroud, in the future the parser
should be deprecated/replaced to make the plugin less depending on
the bbndk-scrit changes.

Change-Id: I8d2dc7f0a87cbada6f8807df2bafdfd14476e01d
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-07-30 13:10:48 +02:00
Marco Bubke
96cd2e64d4 QmlDesigner: Remove unused QmlModelView::m_state
Change-Id: I58b0d7582b2c0d13061067e89b3662a5a82f2a8b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-30 12:11:12 +02:00
Fawzi Mohamed
e8a709cd4d qmljs: avoid ecessive updating when cxx types might have changed
perform an update of the qml code model only if a cpp file exporting
qml types has not changed for at least 15 seconds.

Change-Id: I674eed8dd5a68f2d74a8794fd8a237c2d99a3185
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-30 10:53:58 +02:00
Joerg Bornemann
c883498e3b let "build file" only run one build step
For example, C++ source files will be compiled but the build
stops before linking.

Task-number: QBS-283

Change-Id: If0573ea58b9a047980aab0fd8e4828f3d0c315b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-30 09:09:59 +02:00
Christian Kandeler
0a8f93268b ProjectExplorer: Add convenience function BuildStepList::appendStep().
In most cases, there is no value in writing out the index explicitly,
and it is downright annoying when adding steps conditionally.

Change-Id: I2a3947d3dbc11364046c0917c661497d0720725a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 17:18:04 +02:00
Oswald Buddenhagen
d022a2d19c lock baseEnv in cache()
as we modify the environment, it must be properly locked.
this implies that initFrom() also needs to be called with a lock.

Task-number: QTCREATORBUG-9835
Change-Id: I48bae9af9adaa0518e5a9db0ba08ff057ae14f9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-29 16:30:24 +02:00
Oswald Buddenhagen
759d0a69dd always check for baseEnv init failure
creator's file watcher can trigger many parallel, entirely
non-hierarchical project reloads. if there is enough of them to exceed
the thread pool size, some will be serialized already by qtconcurrent,
not by our wait condition. these should notice a faulty spec, too.

Change-Id: I8ce40cb90fbc28045127881d57ec94e125df79af
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-07-29 16:30:15 +02:00
El Mehdi Fekari
eb682d158a Qnx: Align 'Add' and 'Remove' ndk buttons
Change-Id: Id8d0a702941453326e9e17ce4cfcdbd09a5bd2b0
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-07-29 15:49:19 +02:00
Daniel Teske
74352993d5 GenericProjectManager: Clean up code
Remove unused code and cancel any running indexing.

Change-Id: I1afbd6e4e041224e36c715242b8be31991259e86
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-29 12:36:20 +02:00
Fawzi Mohamed
b4909f5077 gcctoolchain: fix read only gcc toolchain widget
disabled editing for platformCodeGenFlags and platformLinkerFlags
fields.

Change-Id: I16e5009064bbaf4f592a385655d10a15700f8742
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 11:32:34 +02:00
hjk
004bbb0956 QmlProfiler: Don't store runConfiguration needlessly
Change-Id: Ie63ef0b1e2989c58de7d9bf92fa3cbc100608512
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-07-29 11:27:19 +02:00
Christian Kandeler
824c6a5c56 QbsProjectManager: Support the "plain C" and "plain C++" wizards.
Change-Id: Idcc8459660526f972949a6f6908acc19bd52a4f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 10:39:29 +02:00