diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 03:00:17 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-07 03:00:17 +0200 |
| commit | 4cda4427b6a2e07dd406362cf7b643b971706b2c (patch) | |
| tree | 72525327d3070f85def2c379bf98a2c4e09bbc6a /.qmake.conf | |
| parent | 38f7cecf6f74ef73e1a86ea48a74364e130511a7 (diff) | |
| parent | 654de8242411dae548795f9b17648608f8a8c28d (diff) | |
| download | qtquickcontrols-4cda4427b6a2e07dd406362cf7b643b971706b2c.tar.gz | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8272137b2bacbb2c446c3b426d864e946261e4fb
Diffstat (limited to '.qmake.conf')
| -rw-r--r-- | .qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.qmake.conf b/.qmake.conf index 6ef30f78..600fb8ae 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,5 +1,5 @@ load(qt_build_config) CONFIG += warning_clean -android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop +android|ios|qnx|isEmpty(QT.widgets.name): CONFIG += no_desktop MODULE_VERSION = 5.12.0 |