Commit Graph

14 Commits

Author SHA1 Message Date
Christian Kandeler
24e81241a5 Remove duplicate module dependencies from qbs files.
These cause a warning now.

Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-05-27 17:59:12 +02:00
Christian Kandeler
d646bde5f4 Fix wrong usage of Properties blocks in qbs files.
A property set on the product level is ignored if the same property
is also set in a Properties block whose condition matches.

Change-Id: I9248d735977e3d8ff8f1836fd80a49f3c8839bdc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-03-15 14:12:26 +01:00
Orgad Shaneh
88267a3299 Generalize QT_NO_CAST_FROM_ASCII
Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-16 01:14:08 +01:00
Orgad Shaneh
c37420eeb3 Help: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: Iba24d4f2d02de790f31d9606c7f9b85faf4670ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
2012-11-27 13:18:22 +01:00
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 10:18:56 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-03 09:26:34 +02:00
Orgad Shaneh
192bd214c7 qml files: Use buildDirectory as includePath for app_version_header
Add some missing app_version_header dependencies

Change-Id: Ieaa16e9a1bdace9032ef78a3329dfac60d28e99a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-01 17:37:26 +02:00
Christian Kandeler
40d919eed8 Support built-in testing infrastructure with qbs build.
I.e. define WITH_TESTS for debug builds or if the respective
environment variable is set.

Change-Id: I2764ece50d0783e8cb030b1695e6f59cf6063248
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-13 10:46:51 +02:00
Yuchen Deng
5252fa4567 qbs files: Enable 'Help' plugin for Qt5
Change-Id: Ib8c7692984eae2d4b9e865837f4ef6970524a87f
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-21 14:16:24 +02:00
Christian Kandeler
1558640ed6 Fix qbs build for help plugin.
Change-Id: Ie71eda809f98b76d32a92b86e6351996451ff4b5
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-22 12:47:36 +02:00
Joerg Bornemann
d6465142eb qbs files: build with Qt5
Help plugin and QmlDesigner have been disabled for Qt5.

Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:03:37 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Orgad Shaneh
164db0feeb qbs: Cleanup
* Removed utils, extensionsystem and aggregation dependencies
for plugins that depend on Core
* Capitalized Find and CPlusPlus

Change-Id: I505e5f46976f26da47ad778860f103b173668b1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-02-28 08:58:11 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01:00