diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-15 10:55:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-15 10:57:49 +0100 |
| commit | 365a3ac6ae50eb53253eca92bfdf4c527b3a5c05 (patch) | |
| tree | c6fa0bf4ccf698fa75e2ebc245f95e424438b13a /src/imports/particles/particles.pro | |
| parent | daa866a196962beb6171f847bd6f691f3ae38300 (diff) | |
| parent | 8ff69297eeddc3f5650c4cc5517c7e2eafaf6c59 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/qmldevtools/qmldevtools.pro
tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp
Change-Id: I12255c16716bd8a74e7047cdb1f9302a4d1ea827
Diffstat (limited to 'src/imports/particles/particles.pro')
| -rw-r--r-- | src/imports/particles/particles.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/imports/particles/particles.pro b/src/imports/particles/particles.pro index 4460d03a04..fb9626c40e 100644 --- a/src/imports/particles/particles.pro +++ b/src/imports/particles/particles.pro @@ -3,6 +3,11 @@ TARGET = particlesplugin TARGETPATH = QtQuick/Particles.2 IMPORT_VERSION = 2.0 +greaterThan(QT_GCC_MAJOR_VERSION, 5) { + # Our code is bad. Temporary workaround. Fixed in 5.8 + QMAKE_CXXFLAGS += -fno-delete-null-pointer-checks -fno-lifetime-dse +} + SOURCES += \ plugin.cpp |