Commit Graph

20593 Commits

Author SHA1 Message Date
Oswald Buddenhagen
5d896112bc dispose of QMakeGlobals::host_mode
follow suit to qmake:
- the spec does not need to set the host mode, especially as some
  generators are multi-host capable
- the only thing the host mode affects is the path separator, which can
  be done directly instead

Change-Id: I618c2c5051234b105c4bc579240aa9f669b4d958
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:35:25 +02:00
Oswald Buddenhagen
2766aaad4b introduce Qt4ProFileNode::sourceDir()
complementary to buildDir()

Change-Id: I8b79775fd5187887901faed667ea83fc4fbca041
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:34:54 +02:00
Oswald Buddenhagen
87fbe16fd5 add QMakeEvaluator::first()
this is a convenience variant of values()

Change-Id: If8e15b46a88c00cef3435b73cf6280ab5f48c062
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:34:46 +02:00
Oswald Buddenhagen
251ed0e878 move LoadFlags to QMakeEvaluator
Change-Id: I931bce3aaf1ccaaacf586ca54b93659485b79372
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:24:44 +02:00
Oswald Buddenhagen
b4f38671a2 move remainder of QMakeEvaluator to an own file
Change-Id: I09bf3ee41e08062e14a6810d8de036e1c246b0b5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:23:31 +02:00
Oswald Buddenhagen
7b3393918c move builtin qmake function implementations to separate file
the functions are still part of the same class, though.

Change-Id: I58a69d334ac9d1d53b5395d0b655895ffe18c7be
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:11:24 +02:00
Tobias Hunger
92cacf3d0e Fix RCs getting removed again
Fix non-CustomExecutable RunConfigurations getting removed directly.

Also keep unconfigured RCs around if they are the active RC. This stops
CustomExecutableRCs from disappearing before the user had a chance to
configure them.

Task-number: QTCREATORBUG-7562
Change-Id: Iaa0c8b9f55425857ad326200071abaea2d390c99
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:08:05 +02:00
Oswald Buddenhagen
c84fbe0455 move QMakeEvaluator declaration to an own file
Change-Id: Ifc13af5f5b8a2b497075027acfb7b621ab0514ad
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:06:40 +02:00
Oswald Buddenhagen
95dfa15a7c ProFileEvaluator::Private => QMakeEvaluator
more natural name. the ProFileEvaluator class itself is somewhat more
high-level, so it will remain named as it is. i'll move around the code
at a later point.

Change-Id: I03fa844d0109e281f3602b4781ac11c6f2954aa4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:06:23 +02:00
Oswald Buddenhagen
ae9b396d98 move sysrootify() out of ProFileEvaluator::Private
it's a higher-level function which will not fit here soon

Change-Id: I42ab45a953b2fea3ba1cb467eeff96fd58fc57be
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:05:23 +02:00
Oswald Buddenhagen
ed633945ba FunctionDef(s) => ProFunctionDef(s), plus move to proitems.h
Change-Id: I7bdde81c1913237f11dbfbe7491e0fe750181cd5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:05:15 +02:00
Oswald Buddenhagen
888c187dd5 ProFileParser => QMakeParser
more natural name

Change-Id: I38d2a2fc785686aa5777afe41452b53f2c24adf8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:05:03 +02:00
Oswald Buddenhagen
24f24c4546 factor QMakeGlobals into an own file
Change-Id: I55d24be06fa78f70bad614a7125c3079c92ab8e5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:47 +02:00
Oswald Buddenhagen
37b2f88e27 ProFileOption => QMakeGlobals
more accurate class name

Change-Id: I4258b221727e79cc88d5f57dd1f6631ba0bba625
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:29 +02:00
Oswald Buddenhagen
d5eca5681d move definition of ALWAYS_INLINE to qmake_global.h
more central place

Change-Id: Id3b3783a167c6c379ad5b1cc0f2b2622444e1174
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:16 +02:00
Oswald Buddenhagen
ff961351eb proparser => qmake
namely:
- proparser_global.h => qmake_global.h,
- PROPARSER_EXPORT => QMAKE_EXPORT
- PROPARSER_AS_LIBRARY => QMAKE_AS_LIBRARY
- PROPARSER_LIBRARY => QMAKE_LIBRARY

Change-Id: I6db1e6339b4dced59819f047874d84dff826f398
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:04:04 +02:00
Oswald Buddenhagen
00ec7f5e70 ProFileEvaluator::Private needs no q pointer
Change-Id: I946f3ebe9fde342fed4648cbbf0d0872d48572da
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 12:03:20 +02:00
Oswald Buddenhagen
171531fcc9 evaluate default_pre per subproject
qt5 qmake does it

Change-Id: I95cab3f6d87e4baf74e1363404fae94ca3a08eec
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:02:55 +02:00
Oswald Buddenhagen
087021a23c add some future safety
detaching an empty vector does not necessarily do anything.
on the downsite, as the sentinel value is not empty any more, we need to
explicitly clear it out when we meet it.

Change-Id: I0f15aa3d421706a5423bf37f3173a807d0d49c53
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-04 12:01:37 +02:00
Daniel Teske
abb210e719 Fix crash on unloading project
Note: A additional change merged from 2.5 is needed.

Task-number: QTCREATORBUG-7524
Change-Id: I9cbbfaff40f5ddeba743cdb258e7cece64d2ad85
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 11:45:12 +02:00
BogDan Vatra
a16d355dce More Android fixes, add default android device.
Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 11:26:56 +02:00
Orgad Shaneh
7c77331ea4 Gerrit: Replace 'additional queries' with a query completer
Change-Id: Idbc3f0a0dc47c63eb02ee105965ec52fda712f84
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-04 09:20:39 +02:00
Orgad Shaneh
cb8c8ca19e Gerrit: Allow custom query
Change-Id: I8ee0967a8f0013c785bc4d6e98ff7b634f488e97
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-04 09:20:27 +02:00
Tobias Hunger
52abdd690f Profile: Make sure name is unique
... not only when adding the profile, but also when renaming it.

Change-Id: Ib13265d2619718bf2d44410b96cd5ed0eeebf38b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-03 14:16:31 +02:00
Daniel Teske
5c04b40860 Don't show the target setup page on adding a subproject
Task-number: QTCREATORBUG-7426
Change-Id: I69232c9cd924a701a5c7b48d124ed2319337ea02
Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
2012-07-03 14:01:17 +02:00
Tobias Hunger
e7993e20ec Make profile matching when loading less strict
This should solve another instance where profiles are needlessly
created.

Task-number: QTCREATORBUG-7564
Change-Id: I7ce7810614ffa4c74797f748edc3bd53a3052548
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-03 12:05:12 +02:00
Tobias Hunger
393996f10a ProfileManager: Do not save settings when they were not yet loaded
Change-Id: I56fd9e62496d88d556625b3409ddfbb3adde5499
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-03 12:04:55 +02:00
Tobias Hunger
bb81ec7dc4 Remove unused method
Change-Id: I1becf390ad700d205724a1a49867e4b7fa0e2175
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-03 12:04:40 +02:00
Tobias Hunger
146cc5f975 Fix profiles getting added again on import
Task-number: QTCREATORBUG-7564
Change-Id: Ida6ee81cc4bde9766f07755f908af5be726f8645
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-03 12:03:27 +02:00
Tobias Hunger
4ff64681f3 Fix crashes when opening projects
Change-Id: I38a3e10344b63b39ff8bd3f7578609997115c0a9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-03 12:03:06 +02:00
Tobias Hunger
b164d728e7 Remove unnecessary private member variable
Change-Id: I099288b126a8aa478d39a266ae98f8fb80a973a1
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-03 12:02:54 +02:00
Tobias Hunger
3716ebb1e4 Fix UI: Stop it from overflowing
Do not overflow the UI when too many options are added to a profile.

Apply some fairy dust to make things look a bit better while at it.

Task-number: QTCREATORBUG-7572
Change-Id: I8d784c0ca88ead20f8eb313e188e715c41d97e16
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-03 12:02:36 +02:00
Friedemann Kleint
403420d975 Remove mdnssd from profile.
Fix breakage from 272e9a37f3.

Change-Id: I142849434946ecda5737596814de4cd63d747bf2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-02 14:07:11 +02:00
Thiago Macieira
272e9a37f3 Don't build mdnssd
This was enabled for Linux only, but Linux users should use Avahi,
which is present on most modern distributions, and implements mDNS
functionality.

Change-Id: Ibb9d16c9fbd5c2571b98e1450276459d18eb65df
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
2012-07-02 12:51:57 +02:00
Orgad Shaneh
202ce8ad70 Git: Improve Clean dialog
Check file iff it is not ignored

Change-Id: I16a489bdd772ea9b4df462b449a23324b5ef3b77
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-02 11:13:33 +02:00
Orgad Shaneh
3b5c40ba47 Git: Cleanup
* Remove unused 'silent' argument
* Do not output 'git --version' command

Change-Id: Ia940efd5ae7e9f262552841c11d20c3d6df559a3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-02 11:10:34 +02:00
Leandro Melo
7d63548964 C++: Fix potentially infinite loop in completion
Could be reproduced in code as below (cursor at |):

    QFormLayout|formLayout *fl = new QFormLayout(this);

Change-Id: I7f5e9ac8ff8dfffbca63d7ab9f837333440c9810
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-29 15:41:40 +02:00
Bojan Petrovic
02eaf147da Text Editor: Fix handling of snippet parameter with no name
Problem was that typing into overlay selection of the snippet
parameter with no name ended the snippet editing. For example,
"do {$$} while ($confition$);" was unusable.

Change-Id: Ife0e68340de328a3492e242ce861f7c9dd225d7e
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-06-29 14:20:38 +02:00
Tobias Hunger
71730cf798 Fix cmake to parse Qt build application output
Task-number: QTCREATORBUG-2450

Change-Id: I7e041aece19b863b59fe2b2164b126cf414f82a9
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-29 13:58:41 +02:00
Tobias Hunger
2f34671e99 More direct comparison of Core::Ids
Change-Id: I8bd29d64bad6a30927ef73845c5bd8cb5337700c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-29 13:58:14 +02:00
Tobias Hunger
c3cd38acee Prettify gcc toolchain widget
Change-Id: I5f26caaa280f7e6df8c5d4a99c71b9261d11db03
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-29 13:57:51 +02:00
Tobias Hunger
bf880ee8b0 Remove unused member variables
Change-Id: I60b95723813cc660d7907fa6f06c6452dc959fe4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-29 13:57:40 +02:00
Tobias Hunger
52e4f9ddc0 Remove unused member variable
Change-Id: I11397ac0e95ef8d754464dfb781667d247d9a83a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-29 13:57:28 +02:00
Christian Kandeler
0ab8e0bbdf Debugger: Name demangler improvements.
- Correctly decode conversion operators and add test cases.
- Adapt to change in the specification regarding template parameter
packs.
- Make #ifdef'ed code compile.

Change-Id: Ifea1408d08172f9aeccd5e64a1e4818cd632a0d0
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-29 10:05:15 +02:00
Orgad Shaneh
dbd3917bbe Botan: Fix warning
GCC 4.7 warns about casting from (unsigned) byte to (signed) char

Change-Id: I00f3a5159e6471b8d43c122350fa223a3b14f5df
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-06-29 09:58:47 +02:00
hjk
e9f5d047bc projectexplorer: literal style
Change-Id: I8e762bb2b0428e70025f801dfe169faef5139a91
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-29 09:13:10 +02:00
hjk
bb0329a319 debugger/analyzer: inline the small start dialogs
Easier to refactor.

Change-Id: I151364182df841e7e543f480b1836a1b1897e913
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-29 08:58:28 +02:00
hjk
344e11c81e qt4buildconfiguration: more direct comparision of ids
Change-Id: I051bf309974092a5c1430b5bf237d2074736e143
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-29 08:56:24 +02:00
hjk
0ba19ff029 profile: use a clone() method, as the copy is not exact
Change-Id: I02667ed57ce68702d8be5cac24614f3b9d713ded
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-29 08:55:59 +02:00
Orgad Shaneh
59417df92a Git: Keep author information on amend
Change-Id: I15982b746656536ae79a612ee563f69b58a4baa7
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-06-28 22:22:08 +02:00