Commit Graph

20593 Commits

Author SHA1 Message Date
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
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
Christian Kandeler
cbce4389a5 Fix warning.
Change-Id: If83dd6afe039a07b39034e724d78bfc1e5138552
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-12 17:28:44 +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
Oswald Buddenhagen
488e7ab608 kill dead s60 code
Change-Id: Ia532432e2e784ecf433ea2681179b8dbe2a9a682
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:15:04 +02:00
Oswald Buddenhagen
0a348dd8e2 use QT_HOST_* where appropriate
for x-builds, the host binaries and data may be in a different place
than the ones for the target.
we have fallback code for qt 4, so we can use the new variables
unconditionally.

this patch may be incomplete - there are still some uses which *may*
need changing.

Change-Id: Ia96c4ea99c5c7fc62bbe32d0283c82eef5c1eefd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 21:14:58 +02:00
Oswald Buddenhagen
da26368d9e make qmake property map ProString-based
Change-Id: I3c25642b885171a47e8fd27e39e5d470d9f24db3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:14:40 +02:00
Oswald Buddenhagen
5b788ea23f consistently use source and build roots for mkspec & feature searches
follow suit with qmake ...

Change-Id: I508039840372a9f53616e8a665aa4cae619983f6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:14:20 +02:00
Oswald Buddenhagen
be47cd2e96 de-duplicate code a bit
Change-Id: I0be34a47d77e63f6298c77aba468df0413635afa
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:14:06 +02:00
Oswald Buddenhagen
d4900ceddc explicitly look for mkspecs/ directories
follow suit with qmake ...

Change-Id: Ia4f28cf200076824043e4626d4144a6d34e68623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:13:56 +02:00
Oswald Buddenhagen
a0515b3b55 read .qmake.super files
follow suit with qmake ...

Change-Id: I8e7f3e3379f6109c8211a69cb397c75c19d880ab
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:13:46 +02:00
Oswald Buddenhagen
5ba6019385 read .qmake.conf files
follow suit with qmake ...

Change-Id: Ic81ea048e043adcb6cc66b1dc64038c948310db8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:13:35 +02:00
Oswald Buddenhagen
0df494a5a1 reshuffle prepareProject() code a bit
looks more like qmake's code now.
deals better with not-yet-existing output directories as well
(QDir::cdUp() does not work with those).

Change-Id: I062e581b7a9062f176a9bf8c686bf48b19ed0975
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:13:25 +02:00
Oswald Buddenhagen
20baedf3b5 do .qmake.cache search per sub-project
follow suit with qmake ...

Change-Id: I40ed12d8cba4ae39b80f47e34c370f40656b9d83
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:13:13 +02:00
Oswald Buddenhagen
bc4c499684 eliminate EvalIntoMode
it's a relic from times of entanglement with ProFileEvaluator.

Change-Id: I903c1a8a21fcb4a0c9029d0245fba56043e62718
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-09 21:12:51 +02:00
Konstantin Tokarev
db6f01ba4a Highlight missing files in resource tree with red font.
Also added possibility to recheck file existance.

Change-Id: I9f5e1d0499eb86238bb5c26420c48f322c87c65e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 16:06:57 +02:00
BogDan Vatra
dab8d6d0e7 Don't add a '/' if the filename is empty
Change-Id: I66d530d70cac17365f3d5925eb76318fe774470f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 14:23:35 +02:00
Konstantin Tokarev
c9a31beda0 Fixed qbs build.
Change-Id: I043b60b55ab39742b599e7f0d70a444366f03bef
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 14:17:08 +02:00
Konstantin Tokarev
67c4788755 Moved CommandButton to Core and made some improvements to it.
Added constructor taking Id, use command description if toolTipBase
is not set.

Change-Id: I56d774e9c194c6f1eb90583f4a13ed75db540ba3
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 14:11:33 +02:00
Christian Kandeler
889409f2cd Debugger: Name demangler improvements.
- Fix assertion macro.
- Make parse tree smaller by getting rid of nodes that serve no purpose.
- Add all examples from the ABI spec to the auto test.

Change-Id: Id63d8330e6380bfb7d56acd1d445f7b70a1f6e70
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-09 12:14:46 +02:00
Francois Ferrand
d77d8fba43 Cleanup popup menu position.
The menus on toolbuttons are not placed next to the menu, like other toolbuttons,
instead of being opened at mouse position.

The code is similar to the code in QToolButton implementation.

Change-Id: I7893b0badcd35e00d0c6a27749d2bcf0b6f1d44b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-09 11:23:16 +02:00
Eike Ziller
0aa702c7ac Make Qt version info details behave like debugging helper details
Show only one panel with "details" at a time. The vertical space
is just not enough otherwise.

Change-Id: I602692166a1451ea5cb09cb9cc955934513355fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-09 09:30:30 +02:00
Christian Kandeler
96368496dc Debugger: Refactor name demangler.
Now all the parsing logic as well as the stringification is in the tree
nodes.

Change-Id: Ie8222729c14c0102d94045026fc61a75cd31cc63
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-06 19:55:09 +02:00
Christian Kandeler
91d22556d7 Fix compilation with namespaced Qt.
Change-Id: I0407a74e33680ed7bb61298dc1bab3da62c3f938
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-06 17:31:15 +02:00
Christian Kandeler
b206feabe7 Debugger: Refactor name demangler.
So far, we converted the mangled to the demangled representation on the
fly while parsing. Because some demangled strings look different
depending on higher-level context, awkward string manipulations were
then necessary at some later point.
The new solution is much more easily maintainable, creating a tree with
a node for every rule in the grammar first and converting the complete
tree to the demangled string later.

Change-Id: I59088df259611d7cd78af47b81b6a21d628a787f
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-06 10:20:39 +02:00
Daniel Teske
61d7eef9bf Fix compile
Change-Id: Ibf68583e3acbf02a3974e766481f20b640319d8a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-05 21:13:55 +02:00
Francois Ferrand
8a57b7bcbf Support badge on output panel buttons.
These are used to indicate number of issues and todos.

Change-Id: I320b6c0f5835570f0b5e5898fb140bd8266090c8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 17:23:51 +02:00
Francois Ferrand
54569d5931 Support flashing output pane button.
- Add API to IOutputPane to 'flash' the panel button, if it is not open.
- Flash panel button when an error is added.

Change-Id: I842a1d789f28111be85bf4ffc1daf497bfbdc809
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 17:23:45 +02:00
Orgad Shaneh
fbff83d1bf QtSupport: Readd PROPARSER_THREAD_SAFE for qbs build
Removed by mistake on 618115c3cd

Change-Id: Ia87cef28f312a4c951bdac6d366d8b0feb7f1737
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-05 16:26:42 +02:00