- Oct 29, 2013
-
-
Tobias Hunger authored
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>
-
Tobias Hunger authored
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>
-
Eike Ziller authored
The previous workaround for the Qt 4 optimized int,uint,short,ushort QHashNode wasn't working for the QHashNode dumper itself because of unknown key type. Instead we first try to find the 'key' child directly, if that fails we look for it in the second child (which would be the anonymous union from the optimized hash node, which contains the key). Also fix the expected type for QHashNode in the optimized case for Qt4 Change-Id: Ib48c2c0afec081ff38cd750c3d515a5e678e9661 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Morten Johan Sørvig authored
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>
-
Christian Stenger authored
Change-Id: I3ad00ddeeb0f7e9a538af09ccb736fb478d14456 Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
Christian Stenger authored
Change-Id: Id28825e437d9549016c66e9df6b4438eb827c10b Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
Tor Arne Vestbø authored
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>
-
Tor Arne Vestbø authored
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>
-
Tor Arne Vestbø authored
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>
-
Tor Arne Vestbø authored
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>
-
Oswald Buddenhagen authored
Task-number: QTBUG-29642 Change-Id: I9cc209eb313f03bf342bcb64b1de3005755700a7 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/50a90720be7d67dcdfe704a82fb3b1138edd2aab)
-
Tor Arne Vestbø authored
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>
-
Tor Arne Vestbø authored
Change-Id: Ic535a8f7cc2ab7b7f1948b2d0237ebe9a71c7ec7 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/413ec67fc46ad7049f870cdb8ead35149b215d45) Reviewed-by:
Daniel Teske <daniel.teske@digia.com>
-
Eike Ziller authored
Change-Id: Ic1b03d2dffdfb7ba6ead191601127b54af38b3cd Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Tobias Hunger authored
Change-Id: I8121267044b533a882dc9cc15209baa13e37ba6c Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Tobias Hunger authored
That is the case when the debugger options page was never opened. Change-Id: If3cb37810ec51d300dca157b2c0c23c6a6e79b49 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
David Schulz authored
Task-number: QTCREATORBUG-10511 Change-Id: I0c2fde3aedb31a60bc553b490a97841af1746a14 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
hjk authored
Change-Id: Iefae4a8e16c9a5858bbbfba5d4893318156485a2 Reviewed-by:
Christian Stenger <christian.stenger@digia.com>
-
El Mehdi Fekari authored
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>
-
El Mehdi Fekari authored
Change-Id: I253117e3773f0c5e9078ac4ad59125c2b50a611d Reviewed-by:
Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by:
Nicolas Arnaud-Cormos <nicolas@kdab.com>
-
Nikolai Kosjar authored
This static function got moved into a base class. Change-Id: I0b72f324bd52421388c7566dc4fd115a9b27ea7f Reviewed-by:
David Schulz <david.schulz@digia.com>
-
David Schulz authored
Change-Id: I0738581babd73512501cea7f24cba573d45efbae Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Orgad Shaneh <orgads@gmail.com>
-
Orgad Shaneh authored
Functions moved to FileUtils on 4de3b948 Change-Id: I6e8690e8f0cce1bc7162b24d6c7d87d31a724ad8 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com>
-
David Schulz authored
Change-Id: Icc2b2705a587482ac2a4215d05a012c4c15f6439 Reviewed-by:
Nikolai Kosjar <nikolai.kosjar@digia.com>
-
- Oct 28, 2013
-
-
Orgad Shaneh authored
Change-Id: I02416c8a55fcdfdea1cbe349f7e78204c0200fd9 Reviewed-by:
Petar Perisin <petar.perisin@gmail.com>
-
hjk authored
Change-Id: I588cb765fbe09e516b64af962ff5d86efc69f4fb Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Orgad Shaneh authored
Use member directly Change-Id: Id7b67458d40e4f5ae4893101afac423d14dfdba7 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
hjk authored
Change-Id: I02e6b7ff5e2280cabb0f23de942941756f7bf3a0 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
hjk authored
Change-Id: I889b5cd0dbc27144253a9c82567eee59554725a3 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
Tobias Hunger authored
Change-Id: I09735507703e9a2c55aff68a25a4405cf12c9ab4 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Tobias Hunger authored
Change-Id: I82e1cd3cca9cc2d79366e1af054640dadebf7871 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Tobias Hunger authored
Change-Id: Icbd14a683d1a5ec53aa2d2337d43a86c26bccac9 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Tobias Hunger authored
Change-Id: I89853ffb4192b0da1f34d471e250d4ec32daa3da Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Fawzi Mohamed authored
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>
-
hluk authored
Change-Id: If4581d2f38db8311138b871b67fdbe164dde1688 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Eike Ziller authored
Also make the structure more self-explained Change-Id: Ia5080f4e07e2a8b7c6b18e1353a4cf1cf3488361 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Eike Ziller authored
Change-Id: Ifd2caaef4d0c286f2855175acb2dc1b835213c37 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Christian Stenger authored
Change-Id: Ic208a45f6d0c7419d83dccd78b552c734421c953 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Fawzi Mohamed authored
Change-Id: I72d8c853c01a62d4e62ab0db382e9144f6f03fd6 Reviewed-by:
Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by:
Fawzi Mohamed <fawzi.mohamed@digia.com>
-
Eike Ziller authored
In Qt4 (u)int hashs are optimized and the key is inside an anonymous union, so, at least with LLDB, we cannot reference "key" directly as a child of the QHashNode Change-Id: Id7cac3d08fa85af599f2b2564a6b1f11b465c7b2 Reviewed-by:
hjk <hjk121@nokiamail.com>
-