rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Update buildbot to Qt 4.8.7" 

This reverts commit b7e0473cb4.
This commit is contained in:
Andrew Nelless 2016-10-28 14:48:36 +01:00
parent 73685c3d92
commit fa7daa48f7
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/src/MainWindow.cpp
View File

@ -51,6 +51,7 @@
#endif #endif
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
#define _WIN32_WINNT 0x0501
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <Windows.h> #include <Windows.h>
#endif #endif

1
src/gui/src/ZeroconfService.h
View File

@ -21,7 +21,6 @@
#include "ZeroconfRecord.h" #include "ZeroconfRecord.h"
#include <QtCore/QObject> #include <QtCore/QObject>
#include <stdint.h>
typedef int32_t DNSServiceErrorType; typedef int32_t DNSServiceErrorType;

2
src/setup/win32/Include.wxi
View File

@ -7,7 +7,7 @@
<?define BinPath="../../../bin/$(var.Configuration)" ?> <?define BinPath="../../../bin/$(var.Configuration)" ?>
<?define ResPath="../../../res" ?> <?define ResPath="../../../res" ?>
<?define ExtPath="../../../ext" ?> <?define ExtPath="../../../ext" ?>
<?define QtPath="C:\Qt\4.8.7\bin" ?> <?define QtPath="C:\Qt\2010.02\qt\bin" ?>
<?ifndef Version ?> <?ifndef Version ?>
<?define Version="1.0.0" ?> <?define Version="1.0.0" ?>

3
src/setup/win32/Product.wxs
View File

@ -118,8 +118,7 @@
</File> </File>
<File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" /> <File Source="$(var.QtPath)\libgcc_s_dw2-1.dll" />
<File Source="$(var.QtPath)\libwinpthread-1.dll" /> <File Source="$(var.QtPath)\mingwm10.dll" />
<File Source="$(var.QtPath)\libstdc++-6.dll" />
<File Source="$(var.QtPath)\QtCore4.dll" /> <File Source="$(var.QtPath)\QtCore4.dll" />
<File Source="$(var.QtPath)\QtGui4.dll" /> <File Source="$(var.QtPath)\QtGui4.dll" />
<File Source="$(var.QtPath)\QtNetwork4.dll" /> <File Source="$(var.QtPath)\QtNetwork4.dll" />