Change-Id: I311768d2593ebeacdf69b8b2f26753addbf87b37
Reviewed-by: hjk <hjk121@nokiamail.com>

Also rename the related factory and config widget.

This was necessary since QmakeRunConfigurationFactory was already
taken by the base class.

Change-Id: I37875935101b7560ad64c8a8c27d821c9810b387
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I47875935101b7560ad64c8a8c27d821c9810b388
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Ibd5a5e5a80bb31b798b26b340fae460fdded7892
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I14971be5c00da949ff46729236c535d1ac29f9bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I0433317d03aefb8e175f2208ca7ae29fa3e9fa49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I6e1bf4e603338e53f9264b0a2ee2a90ef345bbfe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Iee70ddb526a1751120be40bfd8d2ae01b27b80b8
Reviewed-by: hjk <hjk121@nokiamail.com>

Add support to add/remove debugger entries to debuggers.xml

This is in addition to the existing mode of writing the debugger
path/debugger engine into the kit. This works reasonably well, but
the new mode offers better control as how the debugger is called, etc.

addKit also got a --debuggerid switch to set the debugger id instead
of using the old configuration format.

Change-Id: Id4be0366d2c126252419cf1ba87cd0e117204e54
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

BlackBerryConfiguration creates single toolchain and debugger for Simulator
and Device.

The names of the created qtVersion, toolChain, debugger, kit in
BlackBerryConfiguration are simplified/unified.

Task-number: QTCREATORBUG-10461
Change-Id: I61bfef30a882b562ab03bd71aa4c3667a63343b8
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

This finally renames the plugin itself.

Change-Id: Ibdf4f4b4e9776c2fdc809e0127f3e1310de44bd1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ie0d54a26db031bc8732e8c83156a1102c5852706
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: Ie60f20964da4636afa53eaa5bb8adf4cad63f98c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ia3adfcbcc61ed955cc7cea5af7cae90d20f249c1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I6be91281667f7f26740e7b62b08ce9d646bbc85e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

This fixes Boot2Qt setting the debugger for its kits.

Change-Id: I3ac3ad70b29b6c852e5e50d3e64258e487455b43
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Iea96398de12845f992d647bbeca3bebf68bdd8ac
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I37f9691a320cdf4c63f7de72b2384624b5f67132
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

Change-Id: Id5043a1f208554b8e73a50ebacdb655af53dc8b5
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I22dd15b10a6b06b380f19eda31925951f4566ecf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Make the retrieval of information on pre-defined macros more explicit
and use the information to populate the tool chain with after it is
constructed.

This avoids doing one run of the compiler per auto-detected debugger during
the start-up of Qt Creator.

Change-Id: Ie741dccede91079b4126056676c31975f340dbae
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Considering that this is a Noop by default we want that inlined.

Change-Id: Iefd822ad9e5fc576fb538d9b891f6e3ed3b914aa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Make the macro Cache accessible to derived classes. This is done
so that we can populate that cache with the data the factory/config widget
already has and thus reducing the number of times we need to run the
compiler.

Change-Id: I5ea72a0688c765ae995db66dde3ed6f6672198b6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Broken by qtbase commit 934f06220391eb0e0ebf66a2eb037f48adb4c43c

Change-Id: I55b1ae8636a1c1cf1ed75f4d03b58ebf5bba511a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Visual studio 9.0 (2008) and 2012 work, but 2010 breaks :(

This reverts commit 0b90d7930804beb2f0a16e97b75a6e8fd9a2b835

Change-Id: I3c9bea05ac07ca8cdeb5be5fb89234675dd72061
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Change-Id: I57dc9297c89b193dbcb7dd9c96ff6d6118ce2191
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>

Change-Id: Ieee4a509b46da937c3bce21f72c77685946db4dd
Reviewed-by: hjk <hjk121@nokiamail.com>

Task-number: QTCREATORBUG-10546

Change-Id: I7b87d4907164840d2c40b70cf919eb31aefebff8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Code cosmetics: Shorten gccPredefinedMacroOptions and move it to
the method that is actually related to that functionality.

Change-Id: I8aae1fd89f58d798f5bec95f16c7b92c44546e4d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Do not warn that the macro data is invalid if gcc failed to run. This
avoids spurious warnings when giving a non-executable file, etc.

Change-Id: I52d731bf2b9a6fc12faaa74d70488125bffd9299
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Add qjson* implementation files from corelib/json
to the qmake build. Add a read-only compile mode,
enabled by defining QT_JSON_READONLY.

Add qmake built-in function parseJson(file, into)
which parses a json file into the given variable.

qmake uses a flat key -> value-list implementation
for storing variables, which means that some hackery
is need to represent arbitrarily nested JSON. Use a
special "_KEYS_" variable for arrays and objects:

Arrays:
["item1", "item2"]
$${array._KEYS_} -> 0 1 2
$${array.0} -> "item1"
$${array.1} -> "item2"

Objects:
{ "key1" : "value1", "key2" : "value2" }
$${object._KEYS_} -> key1 key2
$${object.key1} -> value1
$${object.key2} -> value2

Change-Id: I0aa2e4e4ae14fa25be8242bc16d3cffce32504d2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
(cherry picked from qtbase/89ef515177fd5a0b5d95dcffd5fd0b0669e3625a)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Allows project files or mkspecs to call qmake recursively using system()
with the right arguments, which we use to fix the ios default_post.prf.

Change-Id: I90d69e2b156bb0f0af1279188b11f81c84c24fb8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/1cdbe4752bef972db5471e811e9a781749cd0380)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Allows the macx-xcode mkspec to be a wrapper around other mkspecs.

Since QMAKESPEC can now be set in the spec, we have to ensure not
to append to QMAKESPEC.

Change-Id: Idf33ff38147f14c488f14b426c02d9a739fdaecf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/a9bad65b091d15b0446fa141e0a69ebb94b38b70)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Exclusive builds uses setExtraConfigs to apply the particular CONFIG
of each build pass. Unfortunately we were not applying these extra
configs early enough in QMakeEvaluator::visitProFile() for them to
be picked up/usable by default_pre, something that can be useful.

Change-Id: I423a4688250a15f0c1a2cc65a48f0bbc14ad4497
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/eea1c359c9663cec15e7373c065ee06cba151eed)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

The extra variables only need to be applied once, when we
are loading the pro file (and hence are loding pre files),
not for every single pri/prf that's loaded as a result of that
(which do not load pre files themselves).

Change-Id: I3118694a8eeccf2dc32c4f62df754033fad13528
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/8e7dc25380dceebca094e092d9feb21ad167ba91)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Task-number: QTBUG-29642
Change-Id: I9cc209eb313f03bf342bcb64b1de3005755700a7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/50a90720be7d67dcdfe704a82fb3b1138edd2aab)

ARGS already exists, but is a flattened list of the arguments, so both
foo(bar, baz) and foo(bar baz) will give count(ARGS, 2), making it
unreliable for validating arguments to qmake functions.

Change-Id: I0bcc16614c64000169431327da48fd1a26708e67
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/09205d573413da8a2ac3826198fe36bb2dc4349f)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: Ic535a8f7cc2ab7b7f1948b2d0237ebe9a71c7ec7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/413ec67fc46ad7049f870cdb8ead35149b215d45)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>