1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use msvc qmake scope where appropriate

Browse Source 
Use 'msvc' instead of 'win32-msvc' or even 'win32-mscv*'.

Change-Id: I21dc7748a4019119066aea0a88a29a61827f9429
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
This commit is contained in:
Joerg Bornemann 2018-11-21 14:18:28 +01:00 committed by Oliver Wolff
parent c02d579c56
commit eef9b4f0d5
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/winmain/winmain.pro
View File

@ -12,10 +12,10 @@ DEFINES += QT_NO_FOREACH
qtConfig(debug_and_release): CONFIG += build_all
win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi
win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi
win32-msvc*:QMAKE_CFLAGS_DEBUG *= -Z7
win32-msvc*:QMAKE_CXXFLAGS_DEBUG *= -Z7
msvc: QMAKE_CFLAGS_DEBUG -= -Zi
msvc: QMAKE_CXXFLAGS_DEBUG -= -Zi
msvc: QMAKE_CFLAGS_DEBUG *= -Z7
msvc: QMAKE_CXXFLAGS_DEBUG *= -Z7
mingw: DEFINES += QT_NEEDS_QMAIN
winrt {

2
tests/auto/corelib/plugin/qlibrary/lib/lib.pro
View File

@ -6,7 +6,7 @@ TARGET = mylib
DESTDIR = ../
QT = core
win32-msvc: DEFINES += WIN32_MSVC
msvc: DEFINES += WIN32_MSVC
# This project is testdata for tst_qlibrary
target.path = $$[QT_INSTALL_TESTS]/tst_qlibrary

2
tests/auto/corelib/plugin/qlibrary/lib2/lib2.pro
View File

@ -7,7 +7,7 @@ DESTDIR = ../
VERSION = 2
QT = core
win32-msvc: DEFINES += WIN32_MSVC
msvc: DEFINES += WIN32_MSVC
# Force a copy of the library to have an extension that is non-standard.
# We want to test if we can load a shared library with *any* filename...

2
tests/auto/corelib/plugin/qpluginloader/lib/lib.pro
View File

@ -7,7 +7,7 @@ DESTDIR = ../bin
winrt:include(../winrt.pri)
QT = core
win32-msvc: DEFINES += WIN32_MSVC
msvc: DEFINES += WIN32_MSVC
# This is testdata for the tst_qpluginloader test.
target.path = $$[QT_INSTALL_TESTS]/tst_qpluginloader/bin

2
tests/auto/corelib/tools/qdatetime/qdatetime.pro
View File

@ -5,7 +5,7 @@ SOURCES = tst_qdatetime.cpp
# For some reason using optimization here triggers a compiler issue, which causes an exception
# However, the code is correct
win32-msvc|win32-msvc9x {
msvc {
!build_pass:message ( "Compiler issue, removing -O1 flag" )
QMAKE_CFLAGS_RELEASE -= -O1
QMAKE_CXXFLAGS_RELEASE -= -O1