diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-01-18 16:02:43 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-02-12 09:12:39 +0000 |
| commit | c4e60ed8283aa7a86e13c09113e7fec6bf41cc42 (patch) | |
| tree | 6cefbf3ece17e255c3962e69573abc88bef060ef /qbs.pro | |
| parent | 17058d1fc537e40e7dda9d6e48ccfb24ea1220f7 (diff) | |
Detect Qt via a module provider
Creation of qbs modules for Qt is now done on demand during project
resolving. The qmake executable(s) are looked up via PATH or taken from
the Qt.qmakeFilePaths provider property. As a result, Qt projects can
now be built without a profile.
The qtprofilesetup library is gone; its code is now in the module
provider. I kept the C++ -> JavaScript conversion as straightforward as
possible and mostly resisted the temptation to "optimize".
The setup-qt tool still exists and mainly sets Qt.qmakeFilePaths.
[ChangeLog] It is no longer required to call setup-qt before building Qt
projects.
Change-Id: I5b7e4711ec47b996911c499f29d8129d90e4731e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'qbs.pro')
| -rw-r--r-- | qbs.pro | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -31,10 +31,8 @@ defineTest(minQtVersion) { TEMPLATE = subdirs corelib.file = src/lib/corelib/corelib.pro -setupqtprofilelib.subdir = src/lib/qtprofilesetup -setupqtprofilelib.depends = corelib src_app.subdir = src/app -src_app.depends = setupqtprofilelib +src_app.depends = corelib src_libexec.subdir = src/libexec src_plugins.subdir = src/plugins CONFIG(shared, static|shared): src_plugins.depends = corelib @@ -48,7 +46,6 @@ qbs_use_bundled_qtscript { } SUBDIRS += \ corelib\ - setupqtprofilelib\ src_app\ src_libexec\ src_plugins\ |