Commit 234a6454 authored by Yuchen Deng's avatar Yuchen Deng Committed by Joerg Bornemann
Browse files

fix cross build use mingw-w64 for Windows



Change-Id: Ie808c819fb0a26f9b846d2dcc3a04c2096626dc4
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@nokia.com>
parent 0baa1368
IDI_ICON1 ICON DISCARDABLE "qtcreator.ico" IDI_ICON1 ICON DISCARDABLE "qtcreator.ico"
IDI_ICON2 ICON DISCARDABLE "winicons\\c.ico" IDI_ICON2 ICON DISCARDABLE "winicons/c.ico"
IDI_ICON3 ICON DISCARDABLE "winicons\\cpp.ico" IDI_ICON3 ICON DISCARDABLE "winicons/cpp.ico"
IDI_ICON4 ICON DISCARDABLE "winicons\\h.ico" IDI_ICON4 ICON DISCARDABLE "winicons/h.ico"
IDI_ICON5 ICON DISCARDABLE "winicons\\ui.ico" IDI_ICON5 ICON DISCARDABLE "winicons/ui.ico"
IDI_ICON6 ICON DISCARDABLE "winicons\\pro.ico" IDI_ICON6 ICON DISCARDABLE "winicons/pro.ico"
IDI_ICON7 ICON DISCARDABLE "winicons\\pri.ico" IDI_ICON7 ICON DISCARDABLE "winicons/pri.ico"
IDI_ICON8 ICON DISCARDABLE "winicons\\qml.ico" IDI_ICON8 ICON DISCARDABLE "winicons/qml.ico"
...@@ -11,7 +11,7 @@ QtcTool { ...@@ -11,7 +11,7 @@ QtcTool {
files: [ "process_ctrlc_stub.cpp" ] files: [ "process_ctrlc_stub.cpp" ]
cpp.dynamicLibraries: [ cpp.dynamicLibraries: [
"user32.lib", "user32",
"shell32.lib" "shell32"
] ]
} }
...@@ -17,7 +17,7 @@ QtcTool { ...@@ -17,7 +17,7 @@ QtcTool {
cpp.dynamicLibraries: { cpp.dynamicLibraries: {
if (qbs.targetOS == "windows") { if (qbs.targetOS == "windows") {
return [ "shell32.lib" ] return [ "shell32" ]
} }
} }
} }
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
#include <windows.h> #include <windows.h>
#include <winsock2.h> #include <winsock2.h>
#include <Ws2tcpip.h> #include <ws2tcpip.h>
#if( defined( _MSC_VER ) ) #if( defined( _MSC_VER ) )
#pragma warning( default:4706 ) #pragma warning( default:4706 )
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
# ifndef NOMINMAX # ifndef NOMINMAX
# define NOMINMAX # define NOMINMAX
# endif # endif
# include <WinSock2.h> # include <winsock2.h>
#endif // Q_OS_WIN #endif // Q_OS_WIN
#include "mdnsderived.h" #include "mdnsderived.h"
......
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
#include <qglobal.h> #include <qglobal.h>
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
# include <Winsock2.h> # include <winsock2.h>
# ifndef SHUT_RDWR # ifndef SHUT_RDWR
# ifdef SD_BOTH # ifdef SD_BOTH
# define SHUT_RDWR SD_BOTH # define SHUT_RDWR SD_BOTH
......
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
#include <QDir> #include <QDir>
#include <QString> #include <QString>
#include <Windows.h> #include <windows.h>
#include <Objbase.h> #include <objbase.h>
#include <Shellapi.h> #include <shellapi.h>
using namespace RegistryAccess; using namespace RegistryAccess;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
#include <QString> #include <QString>
#include <QLatin1String> #include <QLatin1String>
#include <Windows.h> #include <windows.h>
namespace RegistryAccess { namespace RegistryAccess {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment