Update buildbot to Qt 4.8.7

brahma-dev · Oct 26, 2016 · b7e0473cb4e582015aca422a3b83f0a0023d9297 · b7e0473
1 parent f08f0b3
commit b7e0473cb4e582015aca422a3b83f0a0023d9297
Unified Split

Showing with 4 additions and 3 deletions.

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

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

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

+2 −1 src/setup/win32/Product.wxs
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
@@ -51,7 +51,6 @@
 #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,6 +21,7 @@
 #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\2010.02\qt\bin" ?>
+  <?define QtPath="C:\Qt\4.8.7\bin" ?>
 
   <?ifndef Version ?>
   <?define Version="1.0.0" ?>
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
@@ -118,7 +118,8 @@
         </File>
 
         <File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" />
-        <File Source="$(var.QtPath)\mingwm10.dll" />
+        <File Source="$(var.QtPath)\libwinpthread-1.dll" />
+        <File Source="$(var.QtPath)\libstdc++-6.dll" />
         <File Source="$(var.QtPath)\QtCore4.dll" />
         <File Source="$(var.QtPath)\QtGui4.dll" />
         <File Source="$(var.QtPath)\QtNetwork4.dll" />