| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
By default, a clean settings path is used for test environment.
All the default plugins are loaded, although they're not needed.
This change significantly improves loading time for tests.
Change-Id: I24254f3e538e3f0e6d233d0989738dc1ce238209
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
|
|
|
|
|
| |
Change-Id: Ia2f1870ec67ced58ad95bc6e1953575df2b88cd8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
| |
And fix some autotest project file problems uncovered by this.
Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
| |
The respective items are available without it.
Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
|
|
| |
OSX: Move libraries from PlugIns/ to Frameworks/
other: move QmlDesigner plugins to plugins directory
Change-Id: Ia266a3514ce6a496061daa044b3781daae0bc272
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
| |
Like we have now for the qmake build too.
Change-Id: I00a4cc01f35a4d93b52951c5591dadd4b6aa5e79
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
| |
Change-Id: I4afdddfe4d92e80ea831f130716c7713103b1f26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
| |
Like the qmake build does.
Change-Id: I0791e5d09741718d356d869faa04c066ffe56f72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: Id308bdcc916f7bdf931e45b0f02ea0b1ebe12320
Reviewed-by: hjk <hjk121@nokiamail.com>
|
|
|
|
|
|
|
|
|
|
| |
That item was using a directory as an output artifact, which was only
working by accident and often caused warning messages about failure to
remove files.
Use a proper module instead, which is the nicer solution anyway.
Change-Id: Ib75a0ce26a24c78eb5421367995a8fc72f6a3c2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
The semantic change in product.buildDirectory broke some autotests.
Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I998ec20de032b59448585c851e79912010cdac08
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
| |
Task-number: QTCREATORBUG-12473
Change-Id: Ia470605c1e975c0697d25734bdc7e11d19ac7944
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
|
|
|
|
|
|
|
|
|
| |
This is also what the Qt mkspecs do.
Otherwise we get linker errors on some installations
(where libc++abi is required).
Change-Id: I1f204da8825ae4dfd4650b921c8e3f32e0ad6380
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
We accidentally added QT_NO_CAST_FROM_ASCII to the compiler command line
in the last patch.
Change-Id: I503d5b328d2ffb9812cd8cf79b5d52c8a76f07df
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
QtcAutotest, QtcLibrary, QtcPlugin and QtcTool share quite a bit of
code, which is now factored out into this new item from which they all
derive.
Change-Id: Ic947a19e121f37d34968b29c94dd02648da1cd5b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I5ef9956f78da4096d25851951551dca633471fc0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|
|
|
|
|
|
|
| |
Place all plugins in lib/qtcreator/plugins
Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Properties item considered harmful.
Change-Id: I715b589bdcb6ef9ac35790122a1ba6f009652242
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
Just like for QtcPlugin, QtcLibrary etc.
Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The clang flags for C++11 were incomplete.
The linker flag -lc++abi isn't needed.
On OS X the minimum OS version must be set to 10.7.
This amends 7309b6a2d9a30cc6be7087c12aec2ada65de7b36.
Change-Id: I71c1b8b3f9901ecc8f04106874f5697cfaa47a26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
src/libs/qmljs/qmljsmodelmanagerinterface.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
for targeting xp 64bit, it's should be 5.2 (5.02)
LINK : warning LNK4010: invalid subsystem version number 5.01;
default subsystem version assumed
Change-Id: I8683a70148208ff399c6dfe3bd299b6b81206e32
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
|
|\| |
|
| |
| |
| |
| |
| |
| | |
Change-Id: Idc471dd4a9734f71e615532a4d70225435452d27
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|\|
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
|
| |
| |
| |
| |
| |
| |
| | |
"{in,out}put.fileName" -> "{in,out}put.filePath".
Change-Id: Icf55489cdf2187f9f1a6f413054af1fba8025f4c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qbs/imports/QtcTool.qbs
src/plugins/git/giteditor.cpp
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
|
| |
| |
| |
| |
| |
| | |
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|/
|
|
|
| |
Change-Id: I64e39a4a3e3ec2ac4940f997c402fdd3fef4bf5b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: Id1bbd4f3132a98aa981a82a23c85e90830c55583
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
The original name inconveniently starts with 'plugin', creating a
conflict for shell tab completion when trying to enter src/plugins/...
taking extra keystrokes to resolve.
Change-Id: I7fa59d767aa900f73cd643dfab0d5b2131652a2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
| |
At least one tool uses libUtils, and others could very well do that too.
Change-Id: I4ddda966dc18ac05fc074a4e58df9f8c5dc09d44
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
| |
The old name does not fit anymore.
Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
| |
There was more stuff broken by the switch to Qt Quick 2 than were
originally noticed, and the original fix was buggy as well.
Change-Id: I2b3e0619af923c52aba809355ac271b67097adf1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
| |
The one that is left is the only one that's actually a function taking
real input.
This saves a number of includes.
Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
src/plugins/cpptools/cppmodelmanager.cpp
Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
|
| |
| |
| |
| |
| |
| |
| | |
Share plugins and libraries suffix logic
Change-Id: I79f61459a0348937fcadd9791f549364c657b21f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\|
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
qtcreator.pri
qtcreator.qbs
src/plugins/projectexplorer/projectexplorer.cpp
Change-Id: I37e550646f877b50693043894976a693ac22ad5e
|
| |
| |
| |
| |
| |
| |
| | |
Also update qbs submodule so Creator can open itself.
Change-Id: Iaa70d5e83d07a1120e795046ebbd8995159aa2db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|/
|
|
|
|
|
|
|
|
|
| |
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.
Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
- Make project files buildable with current qbs.
- Update qbs submodule to enable Qt Creator to open these project files.
- Fix an invalid access that caused a soft assert.
Change-Id: I976d19240112d1ff048e51036e6702383735352b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
|
|
|
|
|
|
|
|
|
| |
They might have been necessary in ancient times, but nowadays project
properties can be accessed in prepare scripts.
Change-Id: I209b3c7d0caba7c2f4fc2dda80e57b16d8255fe0
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Use sub-projects.
- Move the main application and the application header products
into dedicated files.
As a result, qtcreator.qbs becomes much simpler to understand,
consisting now of just a bunch of global properties and a few sub-project
references.
Change-Id: Ic7300d489d3982394be5ad1d12a79a2914320298
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
| |
Change-Id: I91664e892cd442d6b25a332944dd57e36078d947
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|\ |
|
| |
| |
| |
| |
| | |
Change-Id: I66ca1ad22f8a857582e6d3fdb0bf2dfc8334628a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
| |
| |
| |
| |
| |
| | |
Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
|