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>

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

That is the case when the debugger options page was never opened.

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

Task-number: QTCREATORBUG-10511

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

Change-Id: Iefae4a8e16c9a5858bbbfba5d4893318156485a2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Qcc compiler doesn't support "dumpmachine" option provided by the gcc
to get a list of supported abis from the compiler,
and needs to pass -Wp option when running qcc to get
predefined macros and header paths.

GccToolChain fails to get those information from qcc and print
warning messages on the console.

This patch adds new QccToolChain class and reinterprets
the compiler options to detect predefined macros and header paths.
It also provids list of supported abis
and suggested mkspecs.

Task-number: QTCREATORBUG-10116

Change-Id: Ic48d5c58c5b957f5a8536248888c9a63ca499f34
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I253117e3773f0c5e9078ac4ad59125c2b50a611d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

This static function got moved into a base class.

Change-Id: I0b72f324bd52421388c7566dc4fd115a9b27ea7f
Reviewed-by: David Schulz <david.schulz@digia.com>

Change-Id: I0738581babd73512501cea7f24cba573d45efbae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Functions moved to FileUtils on 4de3b948

Change-Id: I6e8690e8f0cce1bc7162b24d6c7d87d31a724ad8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: Icc2b2705a587482ac2a4215d05a012c4c15f6439
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: I02416c8a55fcdfdea1cbe349f7e78204c0200fd9
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>

Use member directly

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

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

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

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

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

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

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

ref and cref are also in tr1, and in functional, and are useful when
when using functors allocated on the stack that should not be copied.

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

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

Change-Id: I72d8c853c01a62d4e62ab0db382e9144f6f03fd6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>

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

The asserts should be moved from the addDebugger() method
which is called to add an 'empty' debugger when adding new one
from the option page.

Change-Id: Ic402db514d1e97f5fdc12d9bb9070bf29b2ab354
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>