diff options
author | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-02-15 10:14:11 +0100 |
commit | bb0fec8057dd11c359bfcb4aefb66d9b210f52a6 (patch) | |
tree | 903e3220087ff7a3210390933ba3d8b8f7eb5ea3 /src/opengl | |
parent | 8920bf32eebe03cfc8a1a5e97f5b34c09c79a11b (diff) | |
parent | 4ba535616b8d3dfda7fbe162c6513f3008c1077a (diff) |
Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
src/corelib/corelib.pro
src/corelib/global/qrandom.cpp
src/network/access/qhttpnetworkrequest_p.h
src/plugins/platforms/cocoa/qcocoamenu.mm
src/plugins/platforms/cocoa/qcocoansmenu.mm
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/offscreen/qoffscreenintegration.h
src/widgets/kernel/qaction.cpp
src/widgets/widgets.pro
Done-with: Andy Shaw <andy.shaw@qt.io>
Change-Id: Ib01547cf4184023f19858ccf0ce7fb824fed2a8d
Diffstat (limited to 'src/opengl')
-rw-r--r-- | src/opengl/opengl.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro index 077b190d3e..8b2349ff2f 100644 --- a/src/opengl/opengl.pro +++ b/src/opengl/opengl.pro @@ -3,7 +3,7 @@ QT = core-private gui-private widgets-private DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH -win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000 +msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x63000000 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf |