Commit Graph

77 Commits

Author SHA1 Message Date
Christian Kandeler
f97e5f1545 Fix Qt Creator executable installation for qbs.
Commit 59ac67c0bb broke this for non-OS X.

Change-Id: Iac23a3e37bd9964af4ffb79be256f59c0b0fedb9
Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
2015-12-07 13:26:05 +00:00
Jake Petroules
59ac67c0bb Qbs: properly install Info.plist, PkgInfo, and app icon.
The icns files have also been moved into an asset catalog because
"source code" as a rule should be stored in the preferred form of
modification.

Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-21 16:18:51 +00:00
Jake Petroules
d60e3010e8 Qbs: Adapt rpath handling to how it is normally implemented on OS X.
When using rpaths on OS X, the install name prefix should always be set
to "@rpath" and the rpaths should be appropriately set to the locations
in which that binary looks for its dependencies.

While this change is behaviorally identical, it brings the project
setup in line with how developers expect these properties to be set, and
thus reduces confusion.

As an aside, it now correctly follows the principle of relocatability
(install name prefixes like @rpath/Frameworks are only partially
relocatable as opposed to @rpath alone which is fully relocatable).

Change-Id: I7b5cc7a316d2608037ea9ab087029baa85aee2ba
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-21 20:53:31 +00:00
Jake Petroules
46910b46c3 Adapt Qbs code to latest changes.
type: application actually does nothing now, as the application type is
used for both bundled and unbundled products on Apple platforms.
Instead, consoleApplication being set to true influences Qbs not to use
a bundle.

cpp.infoPlistFile became bundle.infoPlistFile in Qbs 1.4.

Change-Id: I6540aa91b2db61ed4cbf2ff30bd46d69db5f9d92
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-21 20:51:12 +00:00
Eike Ziller
cd5f9f6ff8 Merge remote-tracking branch 'origin/3.5'
Change-Id: I7b3ef276d438ff0f184a649153e8aeec08a9f8c9
2015-08-04 13:16:03 +02:00
Nikolai Kosjar
5abfef609a Clang: Check for required mininum LLVM/Clang version
...otherwise, if the compilation fails, the user is left without any
hint.

Change-Id: I753aefac0c9fbd24b148235e792fe3b3a2aea21b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-04 09:25:53 +00:00
Christian Kandeler
d667a23c46 qbs build: Add missing import.
Change-Id: I69b38900dc7b27f1e63b699172000c3d5a208005
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-07-31 09:39:09 +00:00
Christian Kandeler
4d81239051 Adapt RPATHs to new libexec path.
Task-number: QTCREATORBUG-14725
Change-Id: I4b5c76faa878897ca7fbf1fe01945550a2d82964
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-14 08:56:41 +00:00
Christian Kandeler
0b31635a32 qbs project files: Qualify access to product properties in Export items.
Such items behave "module-like" and one should therefore not count on
them having access to the scope of their parent item.

Change-Id: I8a323ae31218c6b1ee721ffaa65c04ccf08943bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-06-30 14:16:45 +00:00
Marco Bubke
e2f8a9883b Introduce codemodelbackend process and library
This is a partial result of wip/clang-oop. More will follow.

This allows us to invoke the completion out of the Qt Creator process
and thus safes us as against libclang crashes.

At this point only the completion use case is supported.

Some notes on the individual components:

 src/libs/codemodelbackendipc
  * library encapsulating the inter process communication handling
  * used by the backend application and in a follow-up change by the
    creator integration

 src/libs/3rdparty/sqlite
  * version 3.8.10.2
  * dependency of codemodelbackendipc, will be used to storage indexing
    data, among others

 src/tools/codemodelbackend
  * the backend application

 tests/unit:
  * unit tests

Change-Id: I91a48e27467581a22fb760a18d8eb926008fea60
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-06-03 14:22:09 +00:00
Christian Stenger
403008cc27 Raise minimum Qt version
Has been forgotten in 9d86b7ed4e.

Change-Id: I4725d98d87b4cd44b363a15d5cdcc61eac4e13f0
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-04-09 11:50:53 +00:00
Orgad Shaneh
044eeacde5 Load only tested plugins when invoked with -test
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>
2015-03-24 06:22:03 +00:00
Christian Kandeler
c0c9a83409 qbs build: Make use of cpp.cxxLanguageVersion.
Change-Id: Ia2f1870ec67ced58ad95bc6e1953575df2b88cd8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-01-20 17:50:18 +01:00
Christian Kandeler
1199a93fc0 qbs build: Make use of AutotestRunner.
And fix some autotest project file problems uncovered by this.

Change-Id: Id2f46aeab31ccfbcffe43bd23af8115c69f57849
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-12-19 15:10:36 +01:00
Christian Kandeler
9d677e3302 qbs build: Remove unneeded import statements.
The respective items are available without it.

Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2014-11-10 15:45:14 +01:00
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
Joerg Bornemann
b354d86014 fix usage of internal module names in qbs project files
Change-Id: I4afdddfe4d92e80ea831f130716c7713103b1f26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-14 18:14:59 +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
Joerg Bornemann
6e333f0607 Qbs: Avoid some warnings
Change-Id: Id308bdcc916f7bdf931e45b0f02ea0b1ebe12320
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-23 15:12:59 +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
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
Christian Kandeler
c18922a349 Replace deprecated construct in qbs files.
"{in,out}put.fileName" -> "{in,out}put.filePath".

Change-Id: Icf55489cdf2187f9f1a6f413054af1fba8025f4c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-27 13:57:53 +01: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
d9c0362b76 qbs build: Fix warning about deprecated property.
Change-Id: Id1bbd4f3132a98aa981a82a23c85e90830c55583
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-21 15:38:13 +01:00
hjk
93b7528431 Rename pluginjsonmetadata.xsl -> qtcreatorplugin2json.xsl
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>
2013-12-20 12:41:09 +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
Christian Kandeler
203a775652 qbs project files: Rename defaults.js to functions.js.
The old name does not fit anymore.

Change-Id: I9e270e6e55ee94edb3dd2dc58c01188be1f91793
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-19 13:28:04 +02:00
Christian Kandeler
7e9a413141 Fix qbs build.
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>
2013-09-19 13:27:55 +02:00
Christian Kandeler
c2ac0902ed Move some functions out of defaults.js and make them project properties.
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>
2013-09-09 12:04:01 +02:00
Oswald Buddenhagen
6896546ba5 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
2013-07-25 13:18:31 +02:00