Commit Graph

76 Commits

Author SHA1 Message Date
Eike Ziller
f4a3b4ca5f Merge remote-tracking branch 'origin/3.4'
Change-Id: Ib5ce531102eeef86a34ee78e6990791cf4c910c4
2015-02-18 16:35:46 +01:00
Christian Kandeler
05f8a2c813 qbs build: Introduce convenience project property sharedSourcesDir.
Change-Id: I69aacc7391e6e25e66eae1fb54b3c1cfb18679ee
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-18 14:49:06 +00:00
Eike Ziller
0763f44504 Bump version
Change-Id: I5ae9ff3bbda235781b490889be292af7812e720e
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-18 08:23:37 +00:00
Christian Kandeler
cdc6d45a8a qbs build: Add the possibility to include additional autotests.
For plugins that don't live in the main repo.

Change-Id: Iebe4b05bfb60f86531ec82a4ae555fdfaac39ead
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-01-26 12:38:10 +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
Robert Loehning
06a47dd56c Version bump
Change-Id: I4c4a77b22cbc46b2970c89ed4b50f0c6338eb575
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-11-28 16:55:15 +01:00
Eike Ziller
3335e8a475 Version bump
Change-Id: If2233d241e83f82400e4e910e405eabebf887d58
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-28 11:28:57 +01: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
Christian Kandeler
1d5091e48f Do not use deprecated Qt functionality.
Replace all* remaining deprecated Qt 4 functions with
their Qt 5 counterparts. This means we no longer need to
define the QT_DISABLE_DEPRECATED_BEFORE macro.
This patch is relatively small because most source-compatible
changes of this kind have been done before.

* The one exception is the QmlDesigner, which uses QWeakPointer
in a deprecated way all over the place.

Change-Id: Id4b839c6685f3b5bdf2b89137f95231758ec53c7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-08-29 14:10:41 +02:00
Oswald Buddenhagen
f3a61e8bf7 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/android/androidglobal.h

Change-Id: I3367bf2ea47c088989175dddeed2210294346f4c
2014-08-05 14:24:23 +02:00
Christian Kandeler
3c6b2691b7 Set the minimum qbs version on the project.
So people will understand why they can't open the projects with older
Creator versions.

Change-Id: Ie9291096ba001b0d31a58d834ba23c95a569d20f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-31 14:54:40 +02:00
Eike Ziller
a2c18fc6ec Version bump
Change-Id: I9be7fde5b69b65e759100efb0595e7ca2ac5bfb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-24 16:35:33 +02:00
Eike Ziller
f42358a16e Fix version number.
Change-Id: I657277feb77f33b345f58729cdc1c05b1fdb5528
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-22 16:35:17 +02:00
Eike Ziller
69fe69f6ba Version bump
Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-08 13:23:32 +02:00
Eike Ziller
e5504be861 Version bump
Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-07 16:54:53 +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
Christian Kandeler
4909428220 qbs build: Adapt to function renaming.
Change-Id: Ia4cc4447e59aaa4f283a7818847633bb7cf9a8aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-04-15 16:57:54 +02:00
Eike Ziller
143b51c563 Version bump
Change-Id: I499d35c45344c21eb4b8aae9e3bab4eb59e13544
2014-04-15 13:28:28 +02:00
Eike Ziller
8864d05329 Version bump
Change-Id: I0c690e5010ade7f3ebbb4a94163d7b44da13c10d
2014-04-04 13:14:41 +02:00
Eike Ziller
7f0b106226 Version bump
Change-Id: I796d981e9b19a54d9ef9ef735d0f72d9ad0b1d34
2014-04-01 13:07:28 +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
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
Eike Ziller
3ba9db48ed Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I5b27eba0a9536d3e6867577ebf2b59d58a13b827
2014-03-04 14:04:07 +01:00
Eike Ziller
5e7b693651 Version bump
Change-Id: Ibb0d0d64f379684b1ae8f7cd55a8a5436056432b
2014-03-03 10:27:59 +01:00
Christian Kandeler
c8881e7ca2 Support configurable library location in qbs build.
And also in the qbs sub-project (for the qbs and qmake builds). This
becomes possible with the qbs submodule update that is part of this
patch.

Change-Id: I8347a8c04a52bcb0682f32d808fb61a90ef3ba72
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-02-28 17:38:41 +01:00
Eike Ziller
9e40e5f7b0 Version bump
Change-Id: I005fb91b5e3cd5956edb108d0ec730db64cc98e9
2014-02-25 13:16:28 +01:00
Eike Ziller
f14d4b34e2 Merge remote-tracking branch 'origin/3.0' 2013-10-10 12:47: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
Eike Ziller
1a202ba5d0 Version bump
Change-Id: I6d0e52f57fe0e2c762ba12a9ed86de2458463772
2013-10-04 17:07:23 +02:00
Eike Ziller
0b82b54c24 Remove remaining usages of Qt Quick 1 / Declarative
Qml editor widgets were still linking against declarative
for qml type registering. Registering is no longer necessary
since they are no longer used in QML.

Also removes the unused qtcomponents.

qmlpuppet of course still links against declarative, but that's not run
in the same process.

Task-number: QTCREATORBUG-10273
Change-Id: Ied12d38d58da5ff3bc694905b84dcd76cbce03af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-10-02 11:39:23 +02:00
Christian Kandeler
1d11fd7344 qbs project: Add properties for pulling in additional resources.
We need this to build plugins located outside the source tree.

Change-Id: Ie587b5e838bf0ce67b19d3222bbc40b53b888e69
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-10-01 15:06:10 +02:00
Christian Kandeler
698144e32e Add qbs project files for autotests.
Note: Since not all autotests are able to run from an installed location,
we need to be able to start them from the build directory, which
in turn forces us to set a destination directory for libraries and plugins,
so they will be found at run-time.

Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:16:09 +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
Christian Kandeler
d0633f0ac9 qbs project files: Add project property ide_source_tree.
The qmake project has this as well. Will become more useful later on.

Change-Id: I6e9b6b1d1a46ea6263a6d5fac4cb30d883a3e077
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:01:39 +02:00
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION
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>
2013-07-09 15:14:10 +02:00
Eike Ziller
c9128b7fdd Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I1aa7506519e0f461f33921ca20ce1b51adb5783f
2013-06-27 14:24:57 +02:00
Joerg Bornemann
5a3c4cc8ef qbs files: fix OS X checks
Change-Id: I618c1ad4bf328492403b48c8e398abd538f74787
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-26 16:46:18 +02:00
Eike Ziller
965966fb47 Version bump
Change-Id: Ibf982c6aac6b0d097d4ec764399197af7a2fe03a
2013-06-26 13:39:40 +02:00
Christian Kandeler
54ed620f35 Refactor qbs project files.
- 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>
2013-06-25 17:05:42 +02:00
Eike Ziller
e8469a2bab Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/fakevim/fakevimhandler.cpp

Change-Id: I8101f18b87859924644471817d4f1408790d5628
2013-06-25 10:14:14 +02:00
Joerg Bornemann
cd37aef6cf update qbs files
Use the new contains function and the targetOS list.

Change-Id: I38b995eb9328e449befad85792512c45670cc8c9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-20 15:31:39 +02:00
Eike Ziller
afe1d5ee65 Merge remote-tracking branch 'origin/2.8'
Conflicts:
	src/plugins/coreplugin/documentmanager.cpp

Change-Id: I6dc025bc0f31eb694c8d9e2dd4ea5cc888ee8a94
2013-06-14 16:21:04 +02:00
Eike Ziller
1b3bb5cb7e Consistently give qbs groups a name.
These nicely show up in the project tree in Qt Creator then.

Change-Id: I9782f5953d61940e6c2a0f61f07bb15aaeba49d9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-06 13:40:51 +02:00
Eike Ziller
80cef80910 Version bump.
Change-Id: I69393d9b2aca0e4a702af8385020547bf89ba6fe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-31 08:52:47 +02:00
Eike Ziller
4d131257f9 Version bump
Change-Id: I3719f99180012d82af603134360fdd9eedab24f9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-05-30 14:23:36 +02:00
Eike Ziller
cccc39ccc7 Version bump
Change-Id: I740c2db6660713aa8db192464c96ce91d827b0e5
2013-05-29 11:57:08 +02:00
Eike Ziller
45f8e241ba Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
2013-05-27 17:17:40 +02:00
Joerg Bornemann
3eba7e44e5 rename ProductModule into Export
This fixes a bunch of warning when building with the updated qbs
version.

Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-05-27 09:59:53 +02:00
Kai Koehne
8765ca6818 Bump version
Change-Id: Ia0714b038bc1655bb3b5b44a98f9fd6093bcdf79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-14 17:15:40 +02:00
Eike Ziller
cba1da4678 Qbs: fix rpaths and install names (mac)
Needs updated qbs submodule for rpath fixes and installNamePrefix.

Change-Id: I6428409f34e87f299ff2d8c72268bee72c1ba2f2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-25 16:47:26 +02:00