summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-02-12 13:07:32 +0100
committerLiang Qi <liang.qi@qt.io>2018-02-12 13:07:32 +0100
commitf4b64ac5649f795ed4f9238cec8d224dcfe26c2c (patch)
treef9ac2e4dfef5a4f56d2f17463c7452083ead7f13 /src
parent4366fe95477f96489f9a7a99df96230f0ac72112 (diff)
parent520ebdbacb3b0d823126d82306107808287425a3 (diff)
downloadqtsvg-f4b64ac5649f795ed4f9238cec8d224dcfe26c2c.tar.gz
Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: Ic852de844e8a1e7acfe4aaaf79acf46674ba5ffa
Diffstat (limited to 'src')
-rw-r--r--src/svg/svg.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/svg/svg.pro b/src/svg/svg.pro
index f9e43b0..b6f17a7 100644
--- a/src/svg/svg.pro
+++ b/src/svg/svg.pro
@@ -3,7 +3,7 @@ QT = core-private gui-private
qtHaveModule(widgets): QT += widgets-private
DEFINES += QT_NO_USING_NAMESPACE
-win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
+msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
QMAKE_DOCS = $$PWD/doc/qtsvg.qdocconf