diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-16 23:10:27 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-09-16 23:11:30 +0200 |
| commit | b95e6e5babc5e70b25076aed8080ee37773000cb (patch) | |
| tree | 21170a1e7062e61507104f9ed0f3be2ca9b6257b /.qmake.conf | |
| parent | 3e9fe00c4e4ae4c096a960b4a3b432fca546007a (diff) | |
| parent | fb1f6733b6d98d84f8abd89623c3878ed4a62573 (diff) | |
| download | qtwayland-b95e6e5babc5e70b25076aed8080ee37773000cb.tar.gz | |
Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
.qmake.conf
Change-Id: Ifb5723b11bf5fe5bb3583018f496beba17c6bf40
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.qmake.conf b/.qmake.conf index 1c947565..3f7f9129 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,5 +2,6 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH DEFINES += QT_NO_JAVA_STYLE_ITERATORS +DEFINES += QT_NO_LINKED_LIST MODULE_VERSION = 6.0.0 |