Revert "Update buildbot to Qt 4.8.7"

This reverts commit b7e0473.
brahma-dev · Oct 28, 2016 · fa7daa48f7f44820f727584e641d53992dd1ed15 · fa7daa4
1 parent 73685c3
commit fa7daa48f7f44820f727584e641d53992dd1ed15
Unified Split

Showing with 3 additions and 4 deletions.

+1 −0 src/gui/src/MainWindow.cpp

+0 −1 src/gui/src/ZeroconfService.h

+1 −1 src/setup/win32/Include.wxi

+1 −2 src/setup/win32/Product.wxs
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
@@ -51,6 +51,7 @@
 #endif
 
 #if defined(Q_OS_WIN)
+#define _WIN32_WINNT 0x0501
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #endif
diff --git a/src/gui/src/ZeroconfService.h b/src/gui/src/ZeroconfService.h
@@ -21,7 +21,6 @@
 #include "ZeroconfRecord.h"
 
 #include <QtCore/QObject>
-#include <stdint.h>
 
 typedef int32_t  DNSServiceErrorType;
 
diff --git a/src/setup/win32/Include.wxi b/src/setup/win32/Include.wxi
@@ -7,7 +7,7 @@
   <?define BinPath="../../../bin/$(var.Configuration)" ?>
   <?define ResPath="../../../res" ?>
   <?define ExtPath="../../../ext" ?>
-  <?define QtPath="C:\Qt\4.8.7\bin" ?>
+  <?define QtPath="C:\Qt\2010.02\qt\bin" ?>
 
   <?ifndef Version ?>
   <?define Version="1.0.0" ?>
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
@@ -118,8 +118,7 @@
         </File>
 
         <File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" />
-        <File Source="$(var.QtPath)\libwinpthread-1.dll" />
-        <File Source="$(var.QtPath)\libstdc++-6.dll" />
+        <File Source="$(var.QtPath)\mingwm10.dll" />
         <File Source="$(var.QtPath)\QtCore4.dll" />
         <File Source="$(var.QtPath)\QtGui4.dll" />
         <File Source="$(var.QtPath)\QtNetwork4.dll" />