Commit Graph

31038 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Orgad Shaneh
60fa56db8e Git: Initialize remote model directory even when no remotes found
Task-number: QTCREATORBUG-9789
Change-Id: If3626e244b9d85ad670d586438710e17bba8e927
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 10:33:18 +02:00
Orgad Shaneh
044a78f750 Git: Support remotes with whitespace on url
Task-number: QTCREATORBUG-9789

Change-Id: Id501ade0ac2ce7093fa38368f13b2bfab31bd35f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 10:32:36 +02:00
Christian Kandeler
1f007a6264 Consolidate the different "Plain C/C++" wizards somewhat.
We should not duplicate all wizard resources for every supported
build system -- this will not scale. Instead, have one top-level
directory for each type of wizard with build system specific data
in respective subdirectories and common data in another.
To support this approach, CustomWizard now traverses the template
directory recursively as long as no wizard specification has been found.

Change-Id: I8aad8cf36c5bf24d062f2d2c17fdb87ad12fd450
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-26 16:14:06 +02:00
Christian Kandeler
080277e8ae Do not offer CMake-specific wizards if that plugin is not enabled.
Rationale:
    a) For people not interested in CMake, the wizards unnecessarily
clutter the UI. If unhandled, this problem would get worse the more
build systems we support.
    b) If such a wizard is actually used in the absence of the plugin,
nothing visible will happen after it has finished, which is guaranteed
to confuse users.

Change-Id: I070409d3185b11d2e04e33927a97843e60c657ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-26 15:14:02 +02:00
Leena Miettinen
78fc438372 Doc: location of generated help files
Change-Id: Ibd2d6f86cd82e98bf9116bc9d5dc14dec1c6d058
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-26 13:47:34 +02:00
Marco Bubke
e9e0a4dd26 QmlDesigner: Use the global QmlModelView
We should change that QmlModelView architecture anyway. It is not really
fitting. Maybe attach one to the model.

Change-Id: Iee041d6e1972bd2cd9040f932404feffbe5728ef
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-25 17:31:06 +02:00
Marco Bubke
e9c4965c91 QmlDesigner: Move setPostion and setSize to QmlItemNode
Change-Id: I7a6e3705807651a81b1408ce4dfaea2cdda731df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:30:00 +02:00
Marco Bubke
d27950b8b9 QmlDesigner: Remove unused code
Change-Id: Idedc365c1cdf73f6728597b87c7a807b25581a1f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:29:52 +02:00
Marco Bubke
3a4a7ff7a9 QmlDesigner: Rename canReparent to instanceCanReparent
Change-Id: I6b2eac40c68a01053133d623690e6ff4c2d02060
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:29:45 +02:00
Marco Bubke
8ce99eda81 QmlDesigner: Rename hasShowContent to instanceHasShowContent
Change-Id: I32871e3a661319deefe910edf2e3cd51fbf8aefa
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:29:40 +02:00
Marco Bubke
8b20287418 QmlDesigner: Return items instead of object for defaultPropertyChildren
Change-Id: I39a4698c187180c8a954e64a44938b1e3bb910fc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:29:34 +02:00
Marco Bubke
90d4e38b36 QmlDesigner: Change defaultProperty in defaultPropertyName
Change-Id: Ic00fb37878c552e8b0bb9137a2985e9af3ca7ddc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:29:27 +02:00
Marco Bubke
4aac7343a4 QmlDesigner: Optimize hasChildren and hasResources
Change-Id: I09a8a0e18172af8f57f0fcf6217bfd9a17a1b230
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:29:22 +02:00
Marco Bubke
7bdd69726f QmlDesigner: Improve QmlItemNode::defaultPropertyChildren()
Change-Id: Idec9cf81437b599c4fa1322f0a856a7c3284ced6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:29:15 +02:00
Marco Bubke
95d3ce1374 QmlDesigner: Improve QmlItemNode::resources()
Change-Id: I7cbe12a44dd4e72c84f65cc97ccd85c7340b7ed0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:28:43 +02:00
Marco Bubke
85cc4a1324 QmlDesigner: Improve QmlItemNode::children()
Change-Id: Ie73690a5810dd35c4cd3ad9431ab12c7a3bc01cb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-07-25 17:28:37 +02:00
Tobias Hunger
34e2636ef7 Gcc: Sanity check predefined macros
Change-Id: Ib6054d4e3348a39eddfc6b41c3a530f1d4d199f0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 15:57:19 +02:00
Tobias Hunger
cb0ef23a55 Gcc: Make sure to not add '\n' to output needlessly
Change-Id: I5a5d9cda5aba60cbf20b54934dde3ecdccdd99e3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 15:57:02 +02:00
Tobias Hunger
96b088d596 Gcc: Speed up autodetection of broken gccs
If a gcc is broken: Do time out earlier and do not try to run it
a second time.

Change-Id: I8742e507c8aaf4b9174848555f057840ee03ad22
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 15:56:48 +02:00
Robert Loehning
a0cb66e938 Squish: Added test for QTCREATORBUG-3620
Task-number: QTCREATORBUG-3620

Change-Id: Ibfcc1a51825b019fd834644da0344143725b0b70
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-25 14:18:44 +02:00
Tobias Hunger
2dd0344b73 Qbs: Use proper mimetype for qbs project files
Change-Id: I88cc3b74bff44d11b019868dc40d43788c035558
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 14:15:01 +02:00
Tobias Hunger
2cfaa2db5b Qbs: Small header cleanup
Change-Id: Ie8972395d7a0f2af18810954c3d8311357afd1cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 14:14:44 +02:00
Oswald Buddenhagen
6896546ba5 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
2013-07-25 13:18:31 +02:00
Nikolai Kosjar
e2ce17ef00 CppTools: Fix "! condition" coding style
Change-Id: Ic7e634e4249fb64edbc2daceb65ec8e9b5f0f8b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-25 13:11:34 +02:00
Mehdi Fekari
782b9994d8 Qnx:Fix broken syncCertificates() method
Change-Id: I83e4b047ee520444629902a60ccf5c2d2dedf577
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 13:10:16 +02:00
El Mehdi Fekari
04c45c395b Qnx: Automatically connect to device when running an app
Task-number: QTCREATORBUG-9839

Change-Id: Iac6e6bd8d4f16d09c82658b9cd02518ee6300e1b
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:34:47 +02:00
Aurindam Jana
1dd9a54ab6 AndroidSettingsWidget: Set JDK path
Use QFileDialog::getExistingDirectory instead of
QFileDialog::getOpenfileName.

Change-Id: I3790f3c238434643fa304e18a42216b951a445c7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:24:44 +02:00
Mehdi Fekari
87b1ea2af7 Qnx: Properly call makeSticky(kit) interface
Change-Id: Ib72bc1e9ced522fca702308250cc5c8f7259d4f2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:15:35 +02:00
Tobias Hunger
4e3c7b9835 Kit: Provide interface to mark individual kit information sticky
Change-Id: Ic45aae21cb8b0f4e4fdd0dcf1009f127e489920c
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-25 12:15:16 +02:00
Nikolai Kosjar
6aceadac27 CppEditor: Fix "! condition" coding style
Change-Id: I216b74933f5e94c49be7f05f0b09ac01b3319d8c
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-25 12:10:30 +02:00