Commit Graph

25 Commits

Author SHA1 Message Date
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
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>
2014-09-02 15:11:24 +02:00
Eike Ziller
deea0022f7 Fix library and plugin paths
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>
2014-09-02 09:24:10 +02:00
Eike Ziller
b5ecaff32c Qbs files: Raise Qt requirement to 5.3.1
Like we have now for the qmake build too.

Change-Id: I00a4cc01f35a4d93b52951c5591dadd4b6aa5e79
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-29 07:49:03 +02:00
Christian Kandeler
99baab0429 qbs build: Hide symbols by default.
Like the qmake build does.

Change-Id: I0791e5d09741718d356d869faa04c066ffe56f72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-23 17:32:10 +02:00
Christian Kandeler
01addecb8d qbs build: Get rid of CopyTransformer.
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>
2014-07-17 13:08:30 +02:00
Christian Kandeler
cbeb77030f Autotests: Fix qbs build.
The semantic change in product.buildDirectory broke some autotests.

Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-16 14:02:19 +02:00
Christian Kandeler
60abd3f0a1 qbs build: Add convenience function for reading process output.
Change-Id: I998ec20de032b59448585c851e79912010cdac08
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-02 11:43:53 +02:00
Joerg Bornemann
272176ca0b QbsProjectManager: Fix rpath on OS X.
Task-number: QTCREATORBUG-12473
Change-Id: Ia470605c1e975c0697d25734bdc7e11d19ac7944
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-06-26 13:48:27 +02:00
Christian Kandeler
fbb0d12961 qbs build: Only pass "-stdlib=libc++" to clang on Mac.
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>
2014-05-23 14:31:32 +02:00
Christian Kandeler
ca3c03c4d3 Autotests: Fix qbs build.
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>
2014-05-22 18:20:46 +02:00
Christian Kandeler
6706659bb1 qbs build: Introduce item QtcProduct.
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>
2014-05-21 17:33:36 +02:00
Joerg Bornemann
dea4531b32 qbs build: set minimum OS X version for autotests
Change-Id: I5ef9956f78da4096d25851951551dca633471fc0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-05-21 15:49:12 +02:00
Orgad Shaneh
6aad96d89b Nuke plugins PROVIDER settings
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>
2014-05-08 15:29:11 +02:00
Christian Kandeler
acfe2a2771 Fix qbs build with clang.
Properties item considered harmful.

Change-Id: I715b589bdcb6ef9ac35790122a1ba6f009652242
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-05-08 11:02:07 +02:00
Christian Kandeler
5c9f175133 qbs build: Make the autotest template available as an import.
Just like for QtcPlugin, QtcLibrary etc.

Change-Id: I395f5863f31abba589864be3ad41ad7fc893787f
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2014-05-08 11:01:44 +02:00
Joerg Bornemann
c8fc52bad6 fix qbs clang build
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 7309b6a2d9.

Change-Id: I71c1b8b3f9901ecc8f04106874f5697cfaa47a26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-05-07 17:02:25 +02:00
Eike Ziller
0fb641c90e Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/libs/qmljs/qmljsmodelmanagerinterface.cpp
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp

Change-Id: Ie216b715d6f87a6d72d3b8fe3d4e777e561579f9
2014-05-02 10:00:20 +02:00
Yuchen Deng
c922887315 qbs: Fix link warning
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>
2014-04-22 10:24:10 +02:00
Eike Ziller
8c1c106a4f Merge remote-tracking branch 'origin/3.1' 2014-04-14 16:53:23 +02:00
Christian Kandeler
49ae4ec538 Fix qbs build on Windows.
Change-Id: Idc471dd4a9734f71e615532a4d70225435452d27
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-08 13:38:05 +02:00
Oswald Buddenhagen
868428cc63 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
2014-03-18 14:46:29 +01:00
Joerg Bornemann
7309b6a2d9 enable C++11 support in qbs build
Change-Id: I64e39a4a3e3ec2ac4940f997c402fdd3fef4bf5b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-14 13:31:48 +01:00
Joerg Bornemann
84df758ec6 use new base import style in qbs files
Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 14:20:22 +01:00
Christian Kandeler
dba595fdea qbs project files: Add library dir to rpaths for tools.
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>
2013-10-11 16:02:34 +02:00
Christian Kandeler
f1da03c73b qbs project files: Make use of new qbsSearchPaths property.
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-09 18:08:56 +02:00