windows + android support

mixedCase · Nov 12, 2015 · 5969e38 · 5969e38
1 parent 153efea
commit 5969e38
Show file tree

Hide file tree

Showing 1,965 changed files with 30,914 additions and 30,675 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,6 @@
 # Qt binding for Go (Windows / Mac OS X / Linux / Android)
 
 ## Desktop (Windows / Mac OS X / Linux)
-(windows is currently not working) -> https://support.microsoft.com/kb/830473
 
 1. Install Go >= 1.5.1
 	* https://storage.googleapis.com/golang/go1.5.1.windows-386.msi
@@ -19,7 +18,7 @@
 	* Windows
 		* Add the directory that contains "gcc" to your PATH
 
-			`C:\Qt\Qt5.5.1\Tools\mingw492_32\bin`
+			`C:\Qt\Qt5.5.1\Tools\mingw492_32\bin\`
 
 	* Mac OS X
 		* Install Xcode >= 7.0.1
@@ -47,28 +46,29 @@
   	`github.com/therecipe/qt/setup.sh`
 
 ## Mobile (Android)
-(windows host is currently not working) -> https://support.microsoft.com/kb/830473
 
 1. Make sure the binding is working by setting up the Desktop version
 
-2. Install the Android SDK `/opt/android-sdk/`
+2. Install the Android SDK `C:\android\android-sdk\` or `/opt/android-sdk/`
 	* http://dl.google.com/android/installer_r24.4.1-windows.exe
 	* http://dl.google.com/android/android-sdk_r24.4.1-macosx.zip
 	* http://dl.google.com/android/android-sdk_r24.4.1-linux.tgz
 
-3. Install the SDK dependencies `/opt/android-sdk/tools/android`
+3. Install the SDK dependencies `C:\android\android-sdk\tools\android.bat` or `/opt/android-sdk/tools/android`
 	* Tools
-		* Android SDK Build-tools
+		* Android SDK Build-tools (23.0.2)
 	* Android 6.0 (API 23)
 		* SDK Platform
+	* Extras (Windows only)
+		* Google USB Driver
 
-4. Install the Android NDK `/opt/android-ndk/`
+4. Install the Android NDK `C:\android\android-ndk\` or `/opt/android-ndk/`
 	* http://dl.google.com/android/ndk/android-ndk-r10e-windows-x86.exe
 	* http://dl.google.com/android/ndk/android-ndk-r10e-darwin-x86_64.bin
 	* http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin
 	* http://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin
 
-5. Install Apache-Ant `/opt/apache-ant/`
+5. Install Apache-Ant `C:\android\apache-ant\` or `/opt/apache-ant/`
 	* http://mirror.synyx.de/apache/ant/binaries/apache-ant-1.9.6-bin.zip
 	* http://mirror.synyx.de/apache/ant/binaries/apache-ant-1.9.6-bin.tar.bz2
 	* http://mirror.synyx.de/apache/ant/binaries/apache-ant-1.9.6-bin.tar.gz

diff --git a/bluetooth/bluetooth.cpp b/bluetooth/bluetooth.cpp
diff --git a/bluetooth/cgo_windows_386.go b/bluetooth/cgo_windows_386.go
@@ -1,12 +1,12 @@
 package bluetooth
 
 /*
-#cgo CPPFLAGS: -pipe -fno-keep-inline-dllexport -O2 -Wall -Wextra -fexceptions -mthreads
+#cgo CPPFLAGS: -pipe -fno-keep-inline-dllexport -O2 -Wall -Wextra
 #cgo CPPFLAGS: -DUNICODE -DQT_NO_DEBUG -DQT_CORE_LIB -DQT_CONCURRENT_LIB -DQT_BLUETOOTH_LIB
 #cgo CPPFLAGS: -IC:/Qt/Qt5.5.1/5.5/mingw492_32/include -IC:/Qt/Qt5.5.1/5.5/mingw492_32/mkspecs/win32-g++
 #cgo CPPFLAGS: -IC:/Qt/Qt5.5.1/5.5/mingw492_32/include/QtCore -IC:/Qt/Qt5.5.1/5.5/mingw492_32/include/QtConcurrent -IC:/Qt/Qt5.5.1/5.5/mingw492_32/include/QtBluetooth
 
-#cgo LDFLAGS: -Wl,-s -Wl,-subsystem,windows -mthreads
-#cgo LDFLAGS: -LC:/Qt/Qt5.5.1/5.5/mingw492_32/bin -lQt5Core -lQt5Concurrent -lQt5Bluetooth
+#cgo LDFLAGS: -Wl,-s -Wl,-subsystem,windows -mthreads -Wl,--allow-multiple-definition
+#cgo LDFLAGS: -LC:/Qt/Qt5.5.1/5.5/mingw492_32/lib -lQt5Core -lQt5Concurrent -lQt5Bluetooth -lmingw32 -lqtmain -lshell32
 */
 import "C"
diff --git a/bluetooth/qbluetoothdevicediscoveryagent.cpp b/bluetooth/qbluetoothdevicediscoveryagent.cpp
@@ -1,11 +1,11 @@
 #include "qbluetoothdevicediscoveryagent.h"
 #include <QBluetoothAddress>
 #include <QMetaObject>
-#include <QObject>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
+#include <QObject>
 #include <QBluetoothDeviceDiscoveryAgent>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qbluetoothdeviceinfo.cpp b/bluetooth/qbluetoothdeviceinfo.cpp
@@ -1,9 +1,9 @@
 #include "qbluetoothdeviceinfo.h"
-#include <QUrl>
 #include <QModelIndex>
 #include <QBluetoothUuid>
 #include <QString>
 #include <QVariant>
+#include <QUrl>
 #include <QBluetoothDeviceInfo>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qbluetoothlocaldevice.cpp b/bluetooth/qbluetoothlocaldevice.cpp
@@ -1,10 +1,10 @@
 #include "qbluetoothlocaldevice.h"
+#include <QMetaObject>
+#include <QObject>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
-#include <QMetaObject>
-#include <QObject>
 #include <QBluetoothAddress>
 #include <QBluetoothLocalDevice>
 #include "_cgo_export.h"

diff --git a/bluetooth/qbluetoothserver.cpp b/bluetooth/qbluetoothserver.cpp
@@ -1,10 +1,10 @@
 #include "qbluetoothserver.h"
+#include <QString>
+#include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
-#include <QBluetoothServiceInfo>
 #include <QObject>
-#include <QString>
-#include <QVariant>
+#include <QBluetoothServiceInfo>
 #include <QBluetoothServer>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qbluetoothservicediscoveryagent.cpp b/bluetooth/qbluetoothservicediscoveryagent.cpp
@@ -1,12 +1,12 @@
 #include "qbluetoothservicediscoveryagent.h"
-#include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
-#include <QBluetoothUuid>
-#include <QObject>
 #include <QBluetoothAddress>
 #include <QMetaObject>
+#include <QBluetoothUuid>
+#include <QObject>
+#include <QString>
 #include <QBluetoothServiceDiscoveryAgent>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qbluetoothserviceinfo.cpp b/bluetooth/qbluetoothserviceinfo.cpp
@@ -1,9 +1,9 @@
 #include "qbluetoothserviceinfo.h"
 #include <QUrl>
 #include <QModelIndex>
-#include <QBluetoothUuid>
-#include <QBluetoothAddress>
 #include <QBluetoothDeviceInfo>
+#include <QBluetoothAddress>
+#include <QBluetoothUuid>
 #include <QString>
 #include <QVariant>
 #include <QBluetoothServiceInfo>

diff --git a/bluetooth/qbluetoothsocket.cpp b/bluetooth/qbluetoothsocket.cpp
@@ -1,13 +1,13 @@
 #include "qbluetoothsocket.h"
-#include <QModelIndex>
-#include <QBluetoothUuid>
 #include <QObject>
+#include <QBluetoothServiceInfo>
 #include <QBluetoothAddress>
-#include <QIODevice>
 #include <QString>
-#include <QVariant>
 #include <QUrl>
-#include <QBluetoothServiceInfo>
+#include <QModelIndex>
+#include <QBluetoothUuid>
+#include <QVariant>
+#include <QIODevice>
 #include <QBluetoothSocket>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qbluetoothtransfermanager.cpp b/bluetooth/qbluetoothtransfermanager.cpp
@@ -1,12 +1,12 @@
 #include "qbluetoothtransfermanager.h"
+#include <QObject>
+#include <QBluetoothTransferReply>
 #include <QIODevice>
+#include <QBluetoothTransferRequest>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
-#include <QObject>
-#include <QBluetoothTransferReply>
-#include <QBluetoothTransferRequest>
 #include <QBluetoothTransferManager>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qbluetoothtransferreply.cpp b/bluetooth/qbluetoothtransferreply.cpp
@@ -1,10 +1,10 @@
 #include "qbluetoothtransferreply.h"
-#include <QMetaObject>
-#include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
+#include <QMetaObject>
 #include <QObject>
+#include <QString>
 #include <QBluetoothTransferReply>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qbluetoothuuid.cpp b/bluetooth/qbluetoothuuid.cpp
@@ -1,9 +1,9 @@
 #include "qbluetoothuuid.h"
-#include <QModelIndex>
-#include <QUuid>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
+#include <QModelIndex>
+#include <QUuid>
 #include <QBluetoothUuid>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qlowenergycharacteristic.cpp b/bluetooth/qlowenergycharacteristic.cpp
@@ -1,9 +1,9 @@
 #include "qlowenergycharacteristic.h"
-#include <QUrl>
 #include <QModelIndex>
 #include <QByteArray>
 #include <QString>
 #include <QVariant>
+#include <QUrl>
 #include <QLowEnergyCharacteristic>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qlowenergycontroller.cpp b/bluetooth/qlowenergycontroller.cpp
@@ -1,11 +1,11 @@
 #include "qlowenergycontroller.h"
-#include <QModelIndex>
 #include <QBluetoothUuid>
 #include <QObject>
 #include <QBluetoothDeviceInfo>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
+#include <QModelIndex>
 #include <QLowEnergyController>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qlowenergydescriptor.cpp b/bluetooth/qlowenergydescriptor.cpp
@@ -1,9 +1,9 @@
 #include "qlowenergydescriptor.h"
-#include <QByteArray>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
+#include <QByteArray>
 #include <QLowEnergyDescriptor>
 #include "_cgo_export.h"
 

diff --git a/bluetooth/qlowenergyservice.cpp b/bluetooth/qlowenergyservice.cpp
@@ -1,12 +1,12 @@
 #include "qlowenergyservice.h"
+#include <QUrl>
+#include <QModelIndex>
+#include <QLowEnergyCharacteristic>
 #include <QByteArray>
+#include <QObject>
 #include <QLowEnergyDescriptor>
-#include <QLowEnergyCharacteristic>
 #include <QString>
 #include <QVariant>
-#include <QUrl>
-#include <QModelIndex>
-#include <QObject>
 #include <QLowEnergyService>
 #include "_cgo_export.h"
 

diff --git a/core/cgo_windows_386.go b/core/cgo_windows_386.go
@@ -1,12 +1,12 @@
 package core
 
 /*
-#cgo CPPFLAGS: -pipe -fno-keep-inline-dllexport -O2 -Wall -Wextra -fexceptions -mthreads
+#cgo CPPFLAGS: -pipe -fno-keep-inline-dllexport -O2 -Wall -Wextra
 #cgo CPPFLAGS: -DUNICODE -DQT_NO_DEBUG -DQT_CORE_LIB
 #cgo CPPFLAGS: -IC:/Qt/Qt5.5.1/5.5/mingw492_32/include -IC:/Qt/Qt5.5.1/5.5/mingw492_32/mkspecs/win32-g++
 #cgo CPPFLAGS: -IC:/Qt/Qt5.5.1/5.5/mingw492_32/include/QtCore
 
-#cgo LDFLAGS: -Wl,-s -Wl,-subsystem,windows -mthreads
-#cgo LDFLAGS: -LC:/Qt/Qt5.5.1/5.5/mingw492_32/bin -lQt5Core
+#cgo LDFLAGS: -Wl,-s -Wl,-subsystem,windows -mthreads -Wl,--allow-multiple-definition
+#cgo LDFLAGS: -LC:/Qt/Qt5.5.1/5.5/mingw492_32/lib -lQt5Core -lmingw32 -lqtmain -lshell32
 */
 import "C"
diff --git a/core/core.cpp b/core/core.cpp
diff --git a/core/qabstractanimation.cpp b/core/qabstractanimation.cpp
@@ -1,10 +1,10 @@
 #include "qabstractanimation.h"
-#include <QMetaObject>
-#include <QObject>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
+#include <QObject>
+#include <QMetaObject>
 #include <QAbstractAnimation>
 #include "_cgo_export.h"
 

diff --git a/core/qabstracteventdispatcher.cpp b/core/qabstracteventdispatcher.cpp
@@ -1,14 +1,14 @@
 #include "qabstracteventdispatcher.h"
-#include <QThread>
+#include <QEvent>
 #include <QAbstractNativeEventFilter>
-#include <QSocketNotifier>
+#include <QString>
+#include <QVariant>
 #include <QUrl>
-#include <QObject>
 #include <QModelIndex>
+#include <QSocketNotifier>
+#include <QThread>
+#include <QObject>
 #include <QEventLoop>
-#include <QEvent>
-#include <QString>
-#include <QVariant>
 #include <QAbstractEventDispatcher>
 #include "_cgo_export.h"
 

diff --git a/core/qabstractitemmodel.cpp b/core/qabstractitemmodel.cpp
@@ -1,11 +1,11 @@
 #include "qabstractitemmodel.h"
-#include <QMetaObject>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
-#include <QObject>
+#include <QMetaObject>
 #include <QMimeData>
+#include <QObject>
 #include <QAbstractItemModel>
 #include "_cgo_export.h"
 

diff --git a/core/qabstractlistmodel.cpp b/core/qabstractlistmodel.cpp
@@ -1,11 +1,11 @@
 #include "qabstractlistmodel.h"
 #include <QList>
+#include <QUrl>
+#include <QModelIndex>
 #include <QMimeData>
 #include <QList>
 #include <QString>
 #include <QVariant>
-#include <QUrl>
-#include <QModelIndex>
 #include <QAbstractListModel>
 #include "_cgo_export.h"
 

diff --git a/core/qabstractproxymodel.cpp b/core/qabstractproxymodel.cpp
@@ -1,10 +1,10 @@
 #include "qabstractproxymodel.h"
+#include <QAbstractItemModel>
 #include <QMimeData>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
-#include <QAbstractItemModel>
 #include <QObject>
 #include <QAbstractProxyModel>
 #include "_cgo_export.h"

diff --git a/core/qabstractstate.cpp b/core/qabstractstate.cpp
@@ -1,9 +1,9 @@
 #include "qabstractstate.h"
+#include <QUrl>
 #include <QModelIndex>
 #include <QObject>
 #include <QString>
 #include <QVariant>
-#include <QUrl>
 #include <QAbstractState>
 #include "_cgo_export.h"
 

diff --git a/core/qabstracttransition.cpp b/core/qabstracttransition.cpp
@@ -1,11 +1,11 @@
 #include "qabstracttransition.h"
-#include <QUrl>
 #include <QModelIndex>
-#include <QAbstractAnimation>
-#include <QObject>
 #include <QAbstractState>
+#include <QObject>
+#include <QAbstractAnimation>
 #include <QString>
 #include <QVariant>
+#include <QUrl>
 #include <QAbstractTransition>
 #include "_cgo_export.h"
 

diff --git a/core/qassociativeiterable.cpp b/core/qassociativeiterable.cpp
@@ -1,8 +1,8 @@
 #include "qassociativeiterable.h"
+#include <QModelIndex>
 #include <QString>
 #include <QVariant>
 #include <QUrl>
-#include <QModelIndex>
 #include <QAssociativeIterable>
 #include "_cgo_export.h"
 

diff --git a/core/qatomicint.cpp b/core/qatomicint.cpp
@@ -1,8 +1,8 @@
 #include "qatomicint.h"
-#include <QString>
 #include <QVariant>
 #include <QUrl>
 #include <QModelIndex>
+#include <QString>
 #include <QAtomicInt>
 #include "_cgo_export.h"