aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2018-01-23 22:22:18 -0800
committerSimon Hausmann <simon.hausmann@qt.io>2018-01-24 18:35:37 +0000
commit598a5dd899e7c3cc77441baeff2630608ffde89a (patch)
treeb09d1c413638600b79368baaaece432f237b074b
parentb78db8c1e4ec16ef8dff1585d14f9375551c47df (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: Simon Hausmann <simon.hausmann@qt.io>
-rw-r--r--src/qml/qml.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml.pro b/src/qml/qml.pro
index e9d7dcbd2d..efea3098af 100644
--- a/src/qml/qml.pro
+++ b/src/qml/qml.pro
@@ -6,7 +6,7 @@ qtConfig(qml-network): \
DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
-win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
+msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000
win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
win32:!winrt:LIBS += -lshell32
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2