Commit Graph

20 Commits

Author SHA1 Message Date
Eike Ziller
ab0c3da08f Merge remote-tracking branch 'origin/2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I37e550646f877b50693043894976a693ac22ad5e
2013-07-11 08:02:41 +02:00
Christian Kandeler
f71bb6d348 Adapt qbs files to qbs.fileinfo renaming.
Also update qbs submodule so Creator can open itself.

Change-Id: Iaa70d5e83d07a1120e795046ebbd8995159aa2db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 16:21:24 +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
Christian Kandeler
5728f7e673 qbs updates.
- 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>
2013-07-08 16:42:42 +02:00
Christian Kandeler
5388a43cbf Remove pointless project property forwardings in pluginspec.qbs.
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>
2013-07-08 11:18:29 +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
Oswald Buddenhagen
8488445fce remove pointless indirection
Change-Id: I91664e892cd442d6b25a332944dd57e36078d947
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-06 16:45:29 +02:00
Oswald Buddenhagen
d77883c16a Merge remote-tracking branch 'origin/2.7' 2013-04-18 15:18:34 +02:00
Christian Kandeler
7dc52d1a54 Fix module name capitalization in pluginspec.qbs.
Change-Id: I66ca1ad22f8a857582e6d3fdb0bf2dfc8334628a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-18 14:18:55 +02:00
Oswald Buddenhagen
f9f8cd354b auto-generate <dependencyList> in .pluginspec files
Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-04-11 12:52:03 +02:00
Oswald Buddenhagen
8b1a98b309 remove bogus uppercasing of the replaced variable name
Change-Id: I8b506a7ab52a12f3ab8a006788fea7ab5c29c8b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-04-02 17:14:18 +02:00
Joerg Bornemann
7f4eabc24f qbs files: remove superfluous version specifications from imports
Change-Id: I5f439e850cbfbb0a1a4802e2dd063687a75afc68
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-03-11 10:41:23 +01:00
Christian Kandeler
030186965f Adapt qbs files to new module property access syntax.
Change-Id: Idf2c04e250be7fcbbb927f423b5651d58a0d4bac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-02-21 10:32:27 +01:00
Christian Kandeler
0cf4f0885b Adapt qbs project files to new installation approach.
This need a qbs build >= commit 5cdf94de to work properly.

Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-01-24 13:02:32 +01:00
Joerg Bornemann
f0e40373d2 qbs files: change file tag of Qt5 plugin metadata files
Change-Id: I3d20ad6efe4c6ed8cd87717ef4fdd58a739ad634
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-08 13:27:08 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 11:22:40 +02:00
Daniel Teske
f3b2ca7d19 Add qbs files for android
Change-Id: I1739879579245303795fc7c6d5bc2206ffb44bcb
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-25 15:57:48 +02:00
Joerg Bornemann
65f9152372 qbs files: generate json files from .pluginspec files for Qt5
Change-Id: I70ce3d8b6ead88b2bb7a595c8aaf465d441ffe98
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-13 16:26:00 +02:00
Orgad Shaneh
f1c299a85e Qbs: Allow provider specification for plugins
Change-Id: I2016da500a9e81d8b2065c4c1c26a15d59c15abf
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-04-05 15:08:57 +02:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01:00