diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-07-19 18:18:05 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@digia.com> | 2014-07-19 18:34:23 +0200 |
commit | ca73389c6a2afd7e88a9bd16333c27fc82fb5c61 (patch) | |
tree | 994d5dbdc2be692baf233601c2f3916981987c97 /.qmake.conf | |
parent | 8a13f087d3c0c7b9010b9861890b27a17889aeaa (diff) | |
parent | ca56fb96dd2228404c3f51691bb78a9f2419f319 (diff) | |
download | qtquickcontrols-ca73389c6a2afd7e88a9bd16333c27fc82fb5c61.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Change-Id: Icc15fe685e94dd043979b6b9c6a624f18f2d1e4c
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 e28797de..997c1b46 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,4 @@ load(qt_build_config) +android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop MODULE_VERSION = 5.4.0 |