diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-11-17 16:24:33 +0100 |
| commit | 0beb79fb0e9ed814b3e9447ccd97a0c099af9e4b (patch) | |
| tree | 28f7411dc50f099ef0812c830525b4f50ed7ecf4 /src/quick/quick.pro | |
| parent | 12a3eff085bc7eb30a5283e32009d2899b464278 (diff) | |
| parent | a7fd83cd0cecb789006baecabfc6a49c49b7f48c (diff) | |
Merge branch remote-tracking branch 'origin/dev' into wip/pointerhandler
We no longer have any hope of getting this into 5.8.
Change-Id: I2decfa47e589ba7ae2d6b951c6517a2c311d0192
Diffstat (limited to 'src/quick/quick.pro')
| -rw-r--r-- | src/quick/quick.pro | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/quick/quick.pro b/src/quick/quick.pro index 9f96ae2e33..2f49a53aa1 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -1,12 +1,8 @@ TARGET = QtQuick QT = core-private gui-private qml-private -!no_network { - QT_PRIVATE = network -} -no_network { - DEFINES += QT_NO_NETWORK -} +qtConfig(qml-network): \ + QT_PRIVATE += network DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS @@ -33,7 +29,8 @@ include(util/util.pri) include(scenegraph/scenegraph.pri) include(items/items.pri) include(handlers/handlers.pri) -include(designer/designer.pri) +qtConfig(quick-designer): \ + include(designer/designer.pri) qtConfig(accessibility) { include(accessible/accessible.pri) } |