Commit Graph

24736 Commits

Author SHA1 Message Date
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
Orgad Shaneh
eff2789348 QtSupport: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I509e2280932477eed8ede5c9cf5d07305bb9ebdb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 16:24:41 +02:00
Daniel Teske
0b79002df4 Fix crash on importing
We need to prevent the profilemanager from signaling us the removal
of the profile, since we always delete the widget anyway.

Task-number: QTCREATORBUG-7611

Change-Id: I7cd90e979e193193562c1c3605343ff09dc84b76
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 12:00:12 +02:00
Orgad Shaneh
618115c3cd Fix qbs build
Change-Id: If532d1498fecdf07fa5f5743b90528f0dd2eab9d
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-05 10:55:11 +02:00
Jarek Kobus
9fb9a94eba Move Targets page before Summary page in plain C/C++ project wizard
Task-number: QTCREATORBUG-7608

Change-Id: I9ae8758a28140b7cc7594bdb17a7e2e3aa4311f6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-05 09:29:24 +02:00
Yuchen Deng
234a6454aa fix cross build use mingw-w64 for Windows
Change-Id: Ie808c819fb0a26f9b846d2dcc3a04c2096626dc4
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-07-05 07:51:20 +02:00
Oswald Buddenhagen
0baa1368fb fix compile on windows
Change-Id: Ida259851e5e25472c4f225c4d063b5cfa7e75475
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 16:09:17 +02:00
Oswald Buddenhagen
d78fd3933b add groundwork for supporting -t and -tp qmake options
Change-Id: Ibb1aafdaeaf8ee53bb11436d2f2ca8ccbf0ffc3c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 14:16:03 +02:00
Oswald Buddenhagen
705afed75d make calculations of baseMkspecDir sane
no point in having strange fallback paths

Change-Id: Ic19daeeebe5a473e8242c6b69f55cf853def6bb5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 14:14:39 +02:00
Oswald Buddenhagen
55dfc27c52 default cumulative mode to off
this is clearly more often used and thus makes for cleaner code

Change-Id: Ic8d100cbfc4134f1b73117b4f4a5aa5a6f4e0ccb
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 14:12:49 +02:00
Oswald Buddenhagen
fe68b3dc6e remove entirely pointless conditional
"**Unknown**" can only be ever returned when querying particular
properties, which we are not doing.

Change-Id: If972a44d7ef2d1ff60261f13e518d40c2a5e66e0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 14:06:57 +02:00
Oswald Buddenhagen
f361579f92 remove stale code
with the removal of the skip jump label some time ago, this condition
became insatisfiable.

Change-Id: I4fc52ca8a38e048fd37c2ae6bfaae69acf09ada0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 14:05:51 +02:00
Oswald Buddenhagen
c7596fa00d delete bogus FIXME
in the context of possibly using the same parse result for multiple
build configurations, resolving env variables already during parsing
would be just wrong.

Change-Id: I49367b5eff5868a38c026b8bd74148e0b359fffb
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 14:05:37 +02:00
Oswald Buddenhagen
9e1116c73b prune feature search paths which don't actually exist
follow suit with qmake ...

Change-Id: Ifd84044f0543a80cdabee980185cc2e8bd492ea6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 14:05:13 +02:00
Oswald Buddenhagen
755d093617 remove support for loading features relative to current directory
follow suit with qmake ...

Change-Id: I15a742511ba551dee8e2794a8f75c648e9ba5df0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 14:04:52 +02:00
Oswald Buddenhagen
8a4053d14b dispose of valuesDirect()
it has become a trivial wrapper around values()

Change-Id: Ia3165ec4cf968588f6ad3f5a2e8abe61dcae2f59
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 14:04:25 +02:00
Oswald Buddenhagen
9a33d2dfb2 make $$PWD non-magic on read
follow suit with qmake ...

Change-Id: I9354713232facc57bd2969d62f44890e274a70b8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 13:57:41 +02:00
Oswald Buddenhagen
c6a0ca7bc8 make project-related variables non-magic
follow suit with qmake ...

Change-Id: I88b4edd12569dcd59d7eed0512cc16d14f2c685e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 13:56:27 +02:00
Oswald Buddenhagen
53351d7d87 move initialization of $$TARGET to setupProject()
follow suit with qmake ...

Change-Id: I307a55cb264aa79f39ffd5fef07ee9f010d98f56
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 13:56:01 +02:00
Oswald Buddenhagen
6507337b47 make $$TEMPLATE magic on write instead of on read
follow suit with qmake ... even if the implementation is somewhat
trivial due to TEMPLATE_PREFIX not existing here yet.

Change-Id: Ifc3eda63ae278ad33b83a0570266950304f77679
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 13:55:51 +02:00
Oswald Buddenhagen
aa52a1da5c add support for $$QMAKE_TARGET.arch
Change-Id: Id10bcb37d37dd30fbe10a224b60ec45b752d34e6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 13:55:33 +02:00
Oswald Buddenhagen
03a84a7e5e make a bunch of invariant variables non-magic
follow suit with qmake ...

Change-Id: I683eb47de3377fe1abf0611f86c4250562aa4132
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 13:55:17 +02:00
Oswald Buddenhagen
055a17de98 move initialization of numerous variables to spec_pre.prf
follow suit with qmake ...

Change-Id: I8a0c3b1317ab87b15001c9a55d3ebd70ee7f2dc6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 13:54:30 +02:00
Oswald Buddenhagen
add2a96bf4 revamp target mode handling
follow suit with qmake ...

Change-Id: Id734e20556925cec5bf8c70d55974eb4a783f49d
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 13:54:13 +02:00
Oswald Buddenhagen
41bf7c896b surround loading of spec with loading spec_pre.prf and spec_post.prf
follow suit with qmake ...

once we move currently builtin functionality to these feature files,
things would break with qt4 (which does not have them). consequently,
we provide our own fallback versions of them.

Change-Id: Ie318f3419d78214472835c41ec1388977f2e9269
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 13:00:00 +02:00
Oswald Buddenhagen
ca2816db1a make "realification" of default specs less convoluted
Change-Id: I8586d8114c8711a18f477039a56d6d8bfc31c88b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:59:41 +02:00
Oswald Buddenhagen
9cef89e691 make failure to load spec or cache fatal
our processing is nowadays precise enough to allow for that.

Change-Id: I0e5c7bb4b40f713f5b4cef26bb7d4c49170ae7ac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:59:33 +02:00
Oswald Buddenhagen
3ef41951c6 revamp maintenance of base values (qmakespec+cache)
instantiate a complete evaluator instead of having just vars and
functions in the option object. that's cleaner.

Change-Id: I0ecd98307832ed072cebfd5b535572f7dcb103c1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:59:22 +02:00
Oswald Buddenhagen
b7152d825d use a separate evaluator for preliminary cache load
it's cleaner this way

Change-Id: I9bb5dea8147a94f4529e77c663fbf59e272409f5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:58:55 +02:00