diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-11-29 12:36:57 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-11-29 12:36:57 +0000 |
| commit | a74d53424c2fc7e5068b0021ac00b2beaa977316 (patch) | |
| tree | a2cc90b13a2757205bd2a5281d18cc704316a214 /qbs | |
| parent | 82a1dc2d663d60faede6e0814b87eaab9868ff9f (diff) | |
| parent | 29c9f8080d2e2ad6ad9573612b0ea171c22d737a (diff) | |
Merge "Merge remote-tracking branch 'origin/4.8'"
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/libclang/functions.js | 3 | ||||
| -rw-r--r-- | qbs/modules/qtc/qtc.qbs | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js index 99577c3146..4d384d773e 100644 --- a/qbs/modules/libclang/functions.js +++ b/qbs/modules/libclang/functions.js @@ -167,6 +167,9 @@ function toolingParameters(llvmConfig) "-Wcovered-switch-default", "-Wnon-virtual-dtor", "-Woverloaded-virtual", + "-Wmissing-field-initializers", + "-Wno-unknown-warning", + "-Wno-unused-command-line-argument", "-fPIC", "-pedantic", "-Wstring-conversion", diff --git a/qbs/modules/qtc/qtc.qbs b/qbs/modules/qtc/qtc.qbs index 0d13dc3f91..9bfcc77a98 100644 --- a/qbs/modules/qtc/qtc.qbs +++ b/qbs/modules/qtc/qtc.qbs @@ -4,16 +4,16 @@ import qbs.FileInfo import "qtc.js" as HelperFunctions Module { - property string qtcreator_display_version: '4.8.0-rc1' + property string qtcreator_display_version: '4.8.0' property string ide_version_major: '4' - property string ide_version_minor: '7' - property string ide_version_release: '84' + property string ide_version_minor: '8' + property string ide_version_release: '0' property string qtcreator_version: ide_version_major + '.' + ide_version_minor + '.' + ide_version_release property string ide_compat_version_major: '4' - property string ide_compat_version_minor: '7' - property string ide_compat_version_release: '84' + property string ide_compat_version_minor: '8' + property string ide_compat_version_release: '0' property string qtcreator_compat_version: ide_compat_version_major + '.' + ide_compat_version_minor + '.' + ide_compat_version_release |