summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-01-23 22:20:54 -0800
committerThiago Macieira <thiago.macieira@intel.com>2018-01-24 21:20:47 +0000
commit7d6bf37049839ca9a2549aa0f7b120ea574366aa (patch)
treeb3589a66fe2e8dcfcdb0479d0dfa1869207a231e /src/concurrent
parentc7170915c722cb9deea5141a8b06cfb87c5d682d (diff)
MSVC: Don't set a DLL base address for 64-bit
The linker complains: LINK : warning LNK4281: undesirable base address 0x67000000 for x64 image; set base address above 4GB for best ASLR optimization And it's not really required anymore, as the recommended /DYNAMICBASE is the default. Change-Id: I56b444f9d6274221a3b7fffd150caab1beecfd43 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/concurrent.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 017153c74d..18510e38a1 100644
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -4,7 +4,7 @@ CONFIG += exceptions
DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH
-win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
+msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf