From eef9b4f0d5c3582364e327eca302f9499dffeea3 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 21 Nov 2018 14:18:28 +0100 Subject: Use msvc qmake scope where appropriate Use 'msvc' instead of 'win32-msvc' or even 'win32-mscv*'. Change-Id: I21dc7748a4019119066aea0a88a29a61827f9429 Reviewed-by: Oliver Wolff Reviewed-by: Thiago Macieira Reviewed-by: Edward Welbourne --- src/winmain/winmain.pro | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/winmain/winmain.pro') diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 4140ae48de..61e9f29d23 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -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 { -- cgit v1.2.3 From 3bf895c8d52a4172cd29ab8a8121e37ec790c47d Mon Sep 17 00:00:00 2001 From: Yuhang Zhao <2546789017@qq.com> Date: Thu, 31 Jan 2019 20:36:17 +0800 Subject: qtmain_win.cpp: Remove unused header files 1. Removed all Qt header files and make it a pure win32 project because it doesn't use any Qt features. 2. According to MSDN, CommandLineToArgvW is in shellapi.h, so replace ShlObj.h with it. Change-Id: I3daacb97f34664ac36f8e887a2c31d38f611b16e Reviewed-by: Friedemann Kleint --- src/winmain/winmain.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/winmain/winmain.pro') diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 61e9f29d23..9cb6ab0c59 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -21,8 +21,8 @@ mingw: DEFINES += QT_NEEDS_QMAIN winrt { SOURCES = qtmain_winrt.cpp } else { + CONFIG -= qt SOURCES = qtmain_win.cpp - LIBS += -lshell32 } -- cgit v1.2.3