summaryrefslogtreecommitdiff
path: root/ZeroTierUI/main.cpp
diff options
context:
space:
mode:
authorAdam Ierymenko <adam.ierymenko@zerotier.com>2014-01-26 22:24:29 -0800
committerAdam Ierymenko <adam.ierymenko@zerotier.com>2014-01-26 22:24:29 -0800
commit28665079a01d26345e1289f2eaaca3307f83ac29 (patch)
tree18a01c523f6e411650c07651b5f25b276f523b1d /ZeroTierUI/main.cpp
parent80997f652b2c2cbca615174f9b2dd09411d723a9 (diff)
downloadinfinitytier-28665079a01d26345e1289f2eaaca3307f83ac29.tar.gz
infinitytier-28665079a01d26345e1289f2eaaca3307f83ac29.zip
Windows UI appearance fixes (font issue, etc.) and fix to WinSock init on GUI client.
Diffstat (limited to 'ZeroTierUI/main.cpp')
-rw-r--r--ZeroTierUI/main.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/ZeroTierUI/main.cpp b/ZeroTierUI/main.cpp
index 5814849c..612d7c83 100644
--- a/ZeroTierUI/main.cpp
+++ b/ZeroTierUI/main.cpp
@@ -32,6 +32,12 @@
#include <QApplication>
#include <QDir>
#include <QString>
+#include <QFont>
+
+#ifdef __WINDOWS__
+#include <WinSock2.h>
+#include <windows.h>
+#endif
QSettings *settings = (QSettings *)0;
@@ -39,6 +45,13 @@ int main(int argc, char *argv[])
{
QApplication a(argc, argv);
+#ifdef __WINDOWS__
+ {
+ WSADATA wsaData;
+ WSAStartup(MAKEWORD(2,2),&wsaData);
+ }
+#endif
+
{
QFile qss(":css/stylesheet.css");
qss.open(QFile::ReadOnly);