- Oct 29, 2013
-
-
Tobias Hunger authored
Change-Id: Ia3adfcbcc61ed955cc7cea5af7cae90d20f249c1 Reviewed-by:
Tobias Hunger <tobias.hunger@digia.com>
-
hjk authored
Change-Id: I6be91281667f7f26740e7b62b08ce9d646bbc85e Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
Tobias Hunger authored
This fixes Boot2Qt setting the debugger for its kits. Change-Id: I3ac3ad70b29b6c852e5e50d3e64258e487455b43 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
hjk authored
Change-Id: Iea96398de12845f992d647bbeca3bebf68bdd8ac Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
Thomas Hartmann authored
Change-Id: I37f9691a320cdf4c63f7de72b2384624b5f67132 Reviewed-by:
Thomas Hartmann <Thomas.Hartmann@digia.com>
-
Friedemann Kleint authored
Change-Id: Id5043a1f208554b8e73a50ebacdb655af53dc8b5 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
hjk authored
Change-Id: I22dd15b10a6b06b380f19eda31925951f4566ecf Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
Tobias Hunger authored
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>
-
Tobias Hunger authored
Considering that this is a Noop by default we want that inlined. Change-Id: Iefd822ad9e5fc576fb538d9b891f6e3ed3b914aa Reviewed-by:
Daniel Teske <daniel.teske@digia.com>
-
Tobias Hunger authored
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>
-
Leena Miettinen authored
Use the Qt Quick Controls application wizard to streamline the process. Remove snippet files and store compilable example code in doc/examples. Do not store generated files. Change-Id: I920484e84b2ef23bce9e77a7b0eddf963fe94552 Reviewed-by:
Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by:
Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-
Daniel Teske authored
Broken by qtbase commit 934f06220391eb0e0ebf66a2eb037f48adb4c43c Change-Id: I55b1ae8636a1c1cf1ed75f4d03b58ebf5bba511a Reviewed-by:
Kai Koehne <kai.koehne@digia.com>
-
Fawzi Mohamed authored
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>
-
David Schulz authored
Change-Id: I57dc9297c89b193dbcb7dd9c96ff6d6118ce2191 Reviewed-by:
Fawzi Mohamed <fawzi.mohamed@digia.com>
-
hjk authored
Change-Id: I27139d8ccc17b665853bec4a37e80568680b5fcc Reviewed-by:
Eike Ziller <eike.ziller@digia.com> Reviewed-by:
David Schulz <david.schulz@digia.com>
-
Thomas Hartmann authored
Composites types need their own code path. Change-Id: Ia1b14bf4f8519f786c08b94f168ec369d79defc0 Reviewed-by:
Thomas Hartmann <Thomas.Hartmann@digia.com>
-
hjk authored
Closer to "production behaviour" Change-Id: Id72a667cdc44c5102b574db30b6e806ab1deba83 Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Fawzi Mohamed authored
Change-Id: Ieee4a509b46da937c3bce21f72c77685946db4dd Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Orgad Shaneh authored
Task-number: QTCREATORBUG-10546 Change-Id: I7b87d4907164840d2c40b70cf919eb31aefebff8 Reviewed-by:
Daniel Teske <daniel.teske@digia.com>
-
Qt Creator QTCREATORBUG-10375 The old Cascades template application was more sample than template and it was simplified. The application UI object name doesn't follow the project name anymore. This change was introduced because C++ class name rules are more restrictive than the project ones. More than that, it is harder to start with some test project and then refractor it to some real one. There is no gain to have UI object class name same as the enclosing project one. The application icon added to the bar-descriptor.xml Change-Id: I198f61a631fa2c758f3e8ac377c06ce7560cc911 Reviewed-by:
Nicolas Arnaud-Cormos <nicolas@kdab.com>
-
hjk authored
Change-Id: Id49e347cc448f6a28271b6af775d56b6e00b4908 Reviewed-by:
David Schulz <david.schulz@digia.com> Reviewed-by:
Eike Ziller <eike.ziller@digia.com>
-
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>
-