diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/winmain | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/winmain')
| -rw-r--r-- | src/winmain/qtmain_win.cpp | 27 | ||||
| -rw-r--r-- | src/winmain/winmain.pro | 10 |
2 files changed, 15 insertions, 22 deletions
diff --git a/src/winmain/qtmain_win.cpp b/src/winmain/qtmain_win.cpp index 3dc1ac0fba..5520a447a9 100644 --- a/src/winmain/qtmain_win.cpp +++ b/src/winmain/qtmain_win.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Windows main function of the Qt Toolkit. @@ -48,12 +48,8 @@ ** ****************************************************************************/ -#include "qt_windows.h" -#include "qbytearray.h" -#include "qstring.h" -#include "qvector.h" - -#include <shlobj.h> +#include <windows.h> +#include <shellapi.h> /* This file contains the code in the qtmain library for Windows. @@ -64,9 +60,6 @@ invoked. */ -QT_USE_NAMESPACE - - #if defined(QT_NEEDS_QMAIN) int qMain(int, char **); #define main qMain @@ -82,27 +75,27 @@ extern "C" int main(int, char **); // Convert a wchar_t to char string, equivalent to QString::toLocal8Bit() // when passed CP_ACP. -static inline char *wideToMulti(int codePage, const wchar_t *aw) +static inline char *wideToMulti(unsigned int codePage, const wchar_t *aw) { - const int required = WideCharToMultiByte(codePage, 0, aw, -1, NULL, 0, NULL, NULL); + const int required = WideCharToMultiByte(codePage, 0, aw, -1, nullptr, 0, nullptr, nullptr); char *result = new char[required]; - WideCharToMultiByte(codePage, 0, aw, -1, result, required, NULL, NULL); + WideCharToMultiByte(codePage, 0, aw, -1, result, required, nullptr, nullptr); return result; } extern "C" int APIENTRY WinMain(HINSTANCE, HINSTANCE, LPSTR /*cmdParamarg*/, int /* cmdShow */) { - int argc; + int argc = 0; wchar_t **argvW = CommandLineToArgvW(GetCommandLineW(), &argc); - if (!argvW) + if (argvW == nullptr) return -1; char **argv = new char *[argc + 1]; - for (int i = 0; i < argc; ++i) + for (int i = 0; i != argc; ++i) argv[i] = wideToMulti(CP_ACP, argvW[i]); argv[argc] = nullptr; LocalFree(argvW); const int exitCode = main(argc, argv); - for (int i = 0; i < argc && argv[i]; ++i) + for (int i = 0; (i != argc) && (argv[i] != nullptr); ++i) delete [] argv[i]; delete [] argv; return exitCode; diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 4140ae48de..9cb6ab0c59 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -12,17 +12,17 @@ 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 { SOURCES = qtmain_winrt.cpp } else { + CONFIG -= qt SOURCES = qtmain_win.cpp - LIBS += -lshell32 } |