diff options
Diffstat (limited to 'src/qml/qml.pro')
| -rw-r--r-- | src/qml/qml.pro | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro index 7c9eef6df1..826a074701 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -1,11 +1,14 @@ TARGET = QtQml -QT = core-private network +QT = core-private + +qtConfig(qml-network): \ + QT += network DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000 win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS -win32:!wince*:!winrt:LIBS += -lshell32 +win32:!winrt:LIBS += -lshell32 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 # Ensure this gcc optimization is switched off for mips platforms to avoid trouble with JIT. @@ -16,11 +19,6 @@ exists("qqml_enable_gcov") { LIBS_PRIVATE += -lgcov } -greaterThan(QT_GCC_MAJOR_VERSION, 5) { - # Our code is bad. Temporary workaround. - QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse -} - # QTBUG-55238, disable new optimizer for MSVC 2015/Update 3. release:win32-msvc*:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ greaterThan(QT_CL_PATCH_VERSION, 24212):QMAKE_CXXFLAGS += -d2SSAOptimizer- |