Commit Graph

25792 Commits

Author SHA1 Message Date
hjk
d1aaa4589e projectexplorer: fix crash on removing last profile
Change-Id: I1ad59e4cba107d6c0cd7f777648d6d2aba483b6c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 18:45:51 +02:00
hjk
a5fb852b7c projectexplorer: prevent crash on complex setting changes.
When Qt Versions and Profiles are removed simultaneously, the profiles
cannot be updated anymore.

Change-Id: I2022fb701d4d9f0704dda6a83c8f53b8add61c14
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 18:45:37 +02:00
Friedemann Kleint
7c8070afec Fix warnings about id being construct from 0 or empty string.
Change-Id: I7776b9035a2decc5e840e0d534d05b42c821e9f9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 16:25:13 +02:00
Daniel Teske
c6bd83875e Fix crash on removing the profile of the last target
The active target is then null, thus calling target->project() crashes

Task-number: QTCREATORBUG-7633
Change-Id: Ia0804b9293b184528d5d949fa30b35877622e65d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-16 16:10:59 +02:00
Montel Laurent
a42ed223cd debugger gdb: fix mem leak (m_ui was never deleted)
Change-Id: I7be846fce3df6ed264954a379a4984666c8dfb06
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 15:46:53 +02:00
Montel Laurent
ae2e6116bc lib sshkeycreationdialog: fix mem leak. m_ui was never deleted
Change-Id: Ia175dc825b2e8bf2cead5728b64323d03a4d8e4b
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-16 15:40:08 +02:00
Orgad Shaneh
9117c6b059 Debugger: Fix "Attach to Remote" dialog
Change-Id: Id59289afb7d74ea150394cf4ddce2a4be56d10d6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-16 15:19:04 +02:00
Daniel Teske
440f0c2b0a Remove warning
Somehow didn't correctly amend the last commit

Change-Id: I004f70e810df9b8501e81d7e847933472fc35ebf
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 15:14:25 +02:00
Orgad Shaneh
19fa243ef7 Dumper: Fix Qt namespace resolution
qqNs should not be called directly

Change-Id: I845b5c1b9af3fbf79bac7a5ab85dc054678e3e53
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-16 15:01:29 +02:00
Daniel Teske
fba821f5c1 Project mode: Fix crash on removing the last profile
Change-Id: I0624e52a9fd176847a42a1a3379ceabc0f03661c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 13:09:23 +02:00
Daniel Teske
113bd5ce7e UnconfiguredProjectPanel: Fix crash if there are no profiles
That can happen, since the default profile is now manual and can be
deleted.

Change-Id: Id9274351e800ba88d7050ca7cd036cfc227a899a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:44:01 +02:00
BogDan Vatra
1a5edbaff9 Make const the functions parameters
Change-Id: Ie02e3bc3cb09734164f573a0af53e4e1a5e99402
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:41:53 +02:00
Friedemann Kleint
29a65750f6 Fix tr() error in Android plugin, use QT_NO_CAST_FROM_ASCII.
Change-Id: I7ccc55c914b4d5447ad238acfb2ff76cc28d6b23
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:40:21 +02:00
Montel Laurent
2cdfad5539 project manager: delete private class (fix mem leak)
Change-Id: If6543e49d5ed3107230dcded2a2117614be190af
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:37:28 +02:00
Montel Laurent
d83fda1c38 remote linux: fix mem leak
Change-Id: I0b421ae53f7651baa2d7c804379c012c6b78201f
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:37:04 +02:00
Montel Laurent
1904aa45b3 remote linux configuration: fix mem leak. Private struct never deleted
Change-Id: I1288847fc905b2bbe24108cb6f1c1f6c4b2757b3
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:34:36 +02:00
Friedemann Kleint
ec9809e657 Fix tr() error in QNX plugin, use QT_NO_CAST_FROM_ASCII.
Change-Id: I44e34b62d16e824939b75d02738f58fd8e3380a7
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:33:42 +02:00
Montel Laurent
a6f3ec03f2 Device support: Use double click to select device
Change-Id: I270da814f3278100e8bc1f90cc1c244cde08ada5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-16 12:27:51 +02:00
Oswald Buddenhagen
4d3c58dee5 make the file error message a bit more informative
Change-Id: If6be3a280e0509541df0354f41a3ed1dad100239
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-13 19:30:11 +02:00
Daniel Molkentin
5a765c7ad8 Mark QNX plugin as experimental for now, just like the Android plugin.
It will still be built to ensure inclusion in the QA process and to
avoid build breakage, but will not be loaded by default.

Change-Id: I9b5253d6f1b1174f8c4226febaa3559dc9bd60d5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-13 17:59:57 +02:00
Christian Stenger
7184fabfc7 Squish: Fix openQmakeProject()
This fixes openQmakeProject(). There's still more
to do (e.g. selecting Release/Debug) what will be
done in later patch(es).

Change-Id: I34ebf793c89b2d2ddf1f97c7eed6c6eb6c7f5bcb
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-13 17:10:17 +02:00
Tobias Nätterlund
a7ac2bb559 New QNX plugin.
This plugin adds support for cross-compiling, deploying, running
and debugging on a PlayBook or QNX Neutrino device.

Change-Id: I0da7ccee40bd7ce4c0d6bdc6884d48ef23167dac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-13 15:37:34 +02:00
Pavel Fric
aed4d1058e Update Czech translation
Change-Id: I8bdbb7ecadad3fb61c70a54484cbc74b51e391c2
Reviewed-by: Vojtech Kral <vojtech@kral.hk>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-13 11:02:22 +02:00
Sergey Belyashov
967d0ebc58 Updated Russian translation
Change-Id: I3a7b2168828866d5e0ba0a1c8438cfea5a0c7e07
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-13 10:21:12 +02:00
Christian Kandeler
cbce4389a5 Fix warning.
Change-Id: If83dd6afe039a07b39034e724d78bfc1e5138552
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-12 17:28:44 +02:00
Aurindam Jana
f2399eb775 Disable QGraphicsDropShadowEffect for Mac
The QGraphicsDropShadowEffect::draw() results in a crash on
Mac https://bugreports.qt-project.org/browse/QTBUG-23205 .

Task-number: QTCREATORBUG-7605
Change-Id: Icee71e6452997b2daede7ef4735e508caf68aa1a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
(cherry picked from commit d0152332a4)
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-07-12 17:25:44 +02:00
Robert Loehning
1d27304628 Squish: Added Desktop target
Change-Id: I3b44bb1083fbfb6624bed4226ab752f6bd81f79f
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-12 16:53:46 +02:00
Robert Loehning
06cad70310 Squish: Updated __selectQtVersionDesktop__
Change-Id: I45b870c9f0def59f11196c98a446a506ce672049
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-07-12 16:53:25 +02:00
Christian Kandeler
3afbd2f912 Debugger:Sync name demangler with specification.
The new stuff is mostly C++11 features (closures etc.).
Also fix a number of bugs uncovered along the way.
All tests succeed now, including the examples
from the specification.

Change-Id: I9b224b0dd82ad8f5b17d5f5d1809d1dea1a7a803
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-12 14:20:52 +02:00
Andre Hartmann
db265b1fa9 Find: Display "This change cannot be undone" only once.
Every click on Search Again displayed an additional warning message bar.

If the bar is closed with the cross button, it reappears on Search
Again.

This implementation extended InfoBar with a reuseable method
bool containsInfo(const QString &id).

Task-number: QTCREATORBUG-6873

Change-Id: I1de100d3526b861fc2de190e32f903795fed52c0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-12 08:45:59 +02:00
Aurindam Jana
d0152332a4 Disable QGraphicsDropShadowEffect for Mac
The QGraphicsDropShadowEffect::draw() results in a crash on
Mac https://bugreports.qt-project.org/browse/QTBUG-23205 .

Task-number: QTCREATORBUG-7605
Change-Id: Icee71e6452997b2daede7ef4735e508caf68aa1a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-07-10 20:14:02 +02:00
Daniel Teske
dd21ecfeb8 PersistentSettingsWriter: Ensure that the directory exists
Task-number: QTCREATORBUG-7600

Change-Id: I5dc5ab24baff8fa14acd4d58dcb554e8531a150c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-10 14:36:35 +02:00
BogDan Vatra
096c4db896 Run zipalign tool after android packges is created and signed.
Change-Id: Idaeb93490723085b8f5f7cae356fbaee40636f89
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-10 11:40:24 +02:00
BogDan Vatra
7140a685d3 Fix Android package signing
Change-Id: I80520267e18b30a9deeceeddf1c05a7646e9bc94
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-10 11:39:59 +02:00
Oswald Buddenhagen
64471a9c4d populate QMAKE_INTERNAL_INCLUDED_FILES
... like qmake does.

Change-Id: I61b5234cdfa19744aa304d3fc15d541145b9f4a3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-10 11:09:41 +02:00
Oswald Buddenhagen
aca1c4bd50 introduce PROEVALUATOR_FULL #define
if this is enabled, the evaluator implements all functionality
necessary for qmake. without it, functionality which is unnecessary or
outright dangerous in qt creator or lupdate context is omitted.

Change-Id: I233cfa6daf2e4451f9f1d3d14711be2a7cfe4293
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:18:29 +02:00
Oswald Buddenhagen
9067399e37 refactor relation between parsedProBlock() & parsedProFile()
this is clearer and not necessarily more code.

Change-Id: Ic698a8076658ae986d0dbdeebb1f4760dd806e35
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:18:22 +02:00
Oswald Buddenhagen
8d7546d006 allow setting QMAKEPATH and QMAKEFEATURES in .qmake.cache
follow suit with qmake ...

Change-Id: Idc957b607bbc87f92c8729946b208f9c24a23b4b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:18:12 +02:00
Oswald Buddenhagen
ce71932ca2 export QMAKESPEC to the project
follow suit with qmake ...

Change-Id: Ib0de27394fc71d01a57eae770da55c5b5aa35f17
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:17:58 +02:00
Oswald Buddenhagen
267e572842 use real qmakespec as basis for finding features
follow suit with qmake ...

Change-Id: Ibc5a97703af1c5f57149b6a5feab16215bc7f9e7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:17:49 +02:00
Oswald Buddenhagen
0e6f6e3ca5 make $$QMAKE_QMAKE available to projects
not setting it outside the main project processing, as it's even less
likely to be needed there.

Change-Id: Ia7afe3a53bf0977d739bf23d7cd79e3a2aee8867
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:17:36 +02:00
Oswald Buddenhagen
cfb11436bf add extra warning about using non-installed prefix build of qt
Change-Id: I7c618bbac6227b372bfe966c04433a60c39932a0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:17:22 +02:00
Oswald Buddenhagen
9d7e5fc015 *QtVersion::warningReason(): de-duplicate code
Change-Id: I08e370cd83de5ea4f4cdfc079cc908d52d81b192
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:17:12 +02:00
Oswald Buddenhagen
de59f3a33b make *QtVersion::warningReason() return a string list
unlike errors, warnings can accumulate

Change-Id: I6632d37a39bf3467d907cfe5c44ba555b918020a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:17:06 +02:00
Oswald Buddenhagen
c902fdf30f qmake property display: sort alphabetically
this is still not the (more or less) logical order in which qmake
displays them, but it is definitely better than what QHash gives us.

Change-Id: I1c037e101daf9526b991144f1d1c113225880be5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:16:49 +02:00
Oswald Buddenhagen
60b41673b5 qmake property display: $$[QT_SYSROOT] is also a path
Change-Id: If5369ee0797b76ced04b92147b8ad023530aa1cd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:16:40 +02:00
Oswald Buddenhagen
5e2be6ac5e prefer /get variants of qmake properties
we care for the current value, not the installed one. this only matters
for developers of qt, but that's sufficiently many, i'd think. :)
it wouldn't be nice to "litter" all variable references with the "/get"
suffix, so do it centrally (even if that's a tad slower).

Change-Id: I620f3da9185e7d2dd7bd4744f28d59d561b79132
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:16:32 +02:00
Oswald Buddenhagen
dc84ac3c0a hide QMAKE_MKSPECS from display of qt version info
BaseQtVersion & co. don't use it for anything anymore. and as the value
used by the project evaluator and qmake during actual project processing
may be "slighly" more extensive than what an out-of-project -query
returns, displaying the value is actually somewhat counterproductive.

Change-Id: I7f22044780d00e71e18d6f3bcf636df756bbcdd3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:16:07 +02:00
Oswald Buddenhagen
5e596e89d0 introduce qmakeProperty(), use instead of versionInfo() where applicable
the idea is to encapsulate accesses to specific variables.

Change-Id: Icafd2c85de6178db1a492a5dd36dde7f1925ea21
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:15:30 +02:00
Oswald Buddenhagen
7324d1f912 de-virtualize versionInfo()
it's not re-implemented anywhere

Change-Id: I5b2da9c0c6dcdb1b738740536a2584e0549a39d9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:15:09 +02:00