| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Change-Id: Ic8309c7c92a380876d337ba9a2d98d074fa8280a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I97dce495081849c92b7bba50f9008da4e7429cad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: I5e2555158a9b24593b79a41c52c0b7a5139971ae
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: I2bcd1ef3f1b08b0b35f19bd488c4fc7ef8ffbdb4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: I92a8dc68521fdd9aa9e47675db65b7b582d1550c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Iba59e41db72e2afdf594f1f7003215d7d8d1e6d3
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Qt 5.3.1 does not set the profix only based on the use of QGuiApplication
but actually checks if the app is a bundle, so the Prefix hack in the
qt.conf for the ios tools is not needed anymore.
Task-number: QTCREATORBUG-12393
Change-Id: I6a228d83370bc62929ffd056b9b3051e4562485e
Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: If5e742f658602e5254a9350902342f8452934674
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/ios/iosdeploystep.cpp
Change-Id: I97c80d288d7af30f4bf64509a09e0fe2e3b85f6f
|
| |
| |
| |
| |
| | |
Change-Id: Id32ed8816ee8f67ffde1daaee3fd5c2d83448f95
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/clangcodemodel/test/clangcompletion_test.cpp
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
src/plugins/projectexplorer/projectexplorer.pro
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
src/plugins/vcsbase/vcsplugin.cpp
src/shared/qbs
Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
|
| |
| |
| |
| |
| | |
Change-Id: Id705cb577171386f1d313adb751541787c9c6ce2
Reviewed-by: hjk <hjk121@nokiamail.com>
|
| |
| |
| |
| |
| | |
Change-Id: I71bb0436ff06cb8981bf465ef42640b622a9f2bc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Change-Id: I7088ac84ae840c9e1dc83ff667938447406cc607
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/qtsupport/qtversionmanager.cpp
src/shared/qbs
Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
|
| |
| |
| |
| |
| |
| | |
Change-Id: I6cdea03f2ebe372dfcd758f927a4adbcf3f96f60
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|/
|
|
|
|
|
|
| |
See http://people.freedesktop.org/~hughsient/appdata/
Change-Id: Idb30ddd17b80a0f606aa42f062b76905f11446b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I51eb77abd8f6903408336a47396d54a7eda7331f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
| |
Change-Id: I81a3f5751be653c15ebef8efbbeaa716c2fdb390
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Rename class type of CustomQmakeProjectWizard from "qt4project" to
"qmakeproject" and document that change in the manual and changes-3.1.0.
Also update all the in-tree xml files to that new class name.
Change-Id: I7a9ef914a429d68e7f37a2115c03fa81d7433398
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I025c236dcd270cef52b8c1a3cc25eac55cdbc849
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
| |
Change-Id: I0919dbaeaf52504b342f7b5943dba6e1693be69a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
src/shared/qbs
Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
|
| |
| |
| |
| |
| | |
Change-Id: I2be8c105fcde044b73f3f24be6db560f71524fe5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| | |
Change-Id: I9f1af9662df781dc2a89149f7229133f844e5f3b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
src/plugins/qmlprofiler/qmlprofilertraceview.cpp
Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
|
| |
| |
| |
| |
| | |
Change-Id: I608811fa480a94e0e3d65fbfb24d2425e7b4049d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|/
|
|
|
| |
Change-Id: I4c1603d2cb8da8ae5e89781529277f9a5177ed3e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
| |
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I6a6c4b12a81377879d5f6e00fd20def98924a41a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
Mostly Git
Change-Id: Id4471cfd26ca7832aa081fb29495d4e6f020f7b8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: I7d3b3aa35ceef3502c6b4250b60a572631a117be
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
|
|
|
|
|
|
|
| |
Task-number: QTIFW-416
Task-number: QTCREATORBUG-10974
Change-Id: Ib2759cda2e24915880e134a13af126572094bd66
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Changed in IFW 1.4
Task-number: QTCREATORBUG-10010
Task-number: QTCREATORBUG-10243
Change-Id: I17ed5ee7bdf5fdc093351ac0c148eb5395fe699f
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
| |
Change-Id: I68052cc83ffb1dac79b571990d85bcc3e17d6fb3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-9491
Change-Id: Iae5025a311b72596a038424baa4cfb60149b1cdd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
| |
Everything is done by the qt.conf mechanism
Task-number: QTIFW-402
Task-number: QTCREATORBUG-10752
Change-Id: I003e7135d29c000a58e151cb9f913712d1110336
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
| |
Change-Id: I935158e523549d55e58b4e4b7be0af2dac2058d6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
Qt 5.2 changed behavior in that the '' characters won't be automatically
stripped away for QCoreApplication::arguments(). Use "" instead, which
is the windows default anyway.
Task-number: QTCREATORBUG-10686
Change-Id: I21929feaf14845d4e8b1a67cff4560c199790295
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The remaining patches are currently not actively used, and unlikely
to be used again in the future.
Change-Id: Ie2cc47d5076f5e28b8182c0ff06621f576c81d34
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
|
|
|
|
|
|
|
|
| |
Lookup is done internally in the dumpers
Change-Id: Idc6a7bd7c47bb7e0655d10c21ac3e17421d98bdc
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|
|
|
|
|
|
| |
Suppress patch warning on Windows
Change-Id: I2af2c45886dd2e095c1050f0ddc47bbdb3d40f86
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|
|
|
|
| |
Change-Id: I2d08d66d0f91a448e2a575387f34baaa8f91b560
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I9865d7d941719ddc228b6e4dea9abf0d702e3653
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Change-Id: I057f0ae070e4b66628dd2ff64aa716dc2000f594
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Dmitry Savchenko <dmitry.a.sav@gmail.com>
Reviewed-by: Viktor Ostashevskyi <ostash@ostash.kiev.ua>
Reviewed-by: Andrey M. Tokarev <andrey.m.tokarev@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
| |
| |
| |
| |
| |
| | |
Task-number: QTCREATORBUG-9150
Change-Id: I5cff954364b04e6cf1003697c7663b52c4a941db
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
They can't be directly in libexec path, because then they couldn't have
their own qt.conf for resolving the Cocoa platform plugin.
Change-Id: I8f3fae85c548747a7d826c078c7ac1fb0a836b43
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
Since we are using Qt Quick 2 now, Qt Creator also needs to find the Qt
Quick 2 imports.
Also make qmlpuppet (Qt Quick 1) optional for deploying Qt.
Task-number: QTBUG-33545
Change-Id: I296e4b3a1827f7b26841e94e15eda718afef81d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
|