diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-07-14 10:18:12 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-07-14 10:26:25 +0200 |
| commit | ed9b5833894f24e2cfbf4c432497d48844a97d1d (patch) | |
| tree | fb9165795726ffb6c0c6cb7de994b30ede62b83b | |
| parent | 75f2374ab16efc9bf178e47d575e2a095953089a (diff) | |
| parent | 4143de9ab93283c6331418610902da4648db5b67 (diff) | |
Merge 1.8 into 1.9
Change-Id: I3bb551a71bf53b4c52416dc3bf0e360e6c0687b3
| -rw-r--r-- | src/lib/corelib/corelib.qbs | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/tools.pri | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 6f470902a..8de80c8f4 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -403,7 +403,6 @@ QbsLibrary { "stlutils.h", "toolchains.cpp", "version.cpp", - "version.h", "visualstudioversioninfo.cpp", "visualstudioversioninfo.h", "vsenvironmentdetector.cpp", @@ -433,6 +432,7 @@ QbsLibrary { "settingsmodel.h", "setupprojectparameters.h", "toolchains.h", + "version.h", ] qbs.install: qbsbuildconfig.installApiHeaders qbs.installDir: headerInstallPrefix + "/tools" diff --git a/src/lib/corelib/tools/tools.pri b/src/lib/corelib/tools/tools.pri index 301d00d05..df85224db 100644 --- a/src/lib/corelib/tools/tools.pri +++ b/src/lib/corelib/tools/tools.pri @@ -123,7 +123,8 @@ osx { $$PWD/installoptions.h \ $$PWD/qbspluginmanager.h \ $$PWD/setupprojectparameters.h \ - $$PWD/toolchains.h + $$PWD/toolchains.h \ + $$PWD/version.h tools_headers.path = $${QBS_INSTALL_PREFIX}/include/qbs/tools INSTALLS += tools_headers } |