[windows][qt] Updated build instructionsupstream/tmpsantos-qt_windows

5 files changed, 33 insertions, 15 deletions

diff --git a/README.md b/README.md
index bac0efab4c..690d6a0128 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,14 @@
 # Mapbox GL Qt on Windows
 
-![Mapbox GL Qt on Windows](mapbox-gl-native.png "Mapbox GL Qt on Windows")
+![Mapbox GL Qt on Windows](mapbox-gl-native1.png "Mapbox GL Qt on Windows")
 
 ## Testing environment
 
-- Qt 5.9.3 for Windows with MinGW 32-bits (won't build with MSVC)
-- Qt Creator
+- Qt 5.7.1 MSVC 2016 Win64
+- LLVM 5.0 Win64
+- OpenSSL 1.0.2n Win64
+- Visual Studio Community 2015 Update 3
+- Qt Creator 4.5.0
 - Windows 10
 - DirectX 11
  
@@ -13,8 +16,16 @@
 ## Building instructions
 
 1. Open the ```mapbox-gl-native.pro``` project file with Qt Creator
-2. Select the **Release** configuration
-3. Hit the **Play** button or **CTRL+R** to build and run the project
+2. Go to Projects -> Manage Kits
+3. Change the "MSVC2015_64bit" kit to use "LLVM 64bit based on MSVC2015" compiler
+4. QtCreator doesn't always save this configuration, you might need to do it every time after opening the project
+
+![Changing the compiler to LLVM](mapbox-gl-native2.png "Changing the compiler to LLVM")
+
+3. Select the **Release** configuration
+4. Hit the **Build Project** button or **CTRL+B** to build and run the project
+5. The project will, by default, build a shared library named `qmapboxgl.dll` that can be used with MSVC projects.
+6. If you want to build the test app, add this to the QMake command line: `CONFIG+=TestApplication`
 
 
 ## Demo app instructions
@@ -29,4 +40,4 @@
 
 - Qt will select the best OpenGL implementation available automatically
 - Running with ANGLE will require DirectX installed
-- Software rendenring can be forced by uncommenting this [line](https://github.com/tmpsantos/mapbox-gl-native/blob/tmpsantos-qt_windows/platform/qt/app/main.cpp#L8)
+- Software rendering can be forced by uncommenting this [line](https://github.com/tmpsantos/mapbox-gl-native/blob/tmpsantos-qt_windows/platform/qt/app/main.cpp#L8)
diff --git a/mapbox-gl-native.png b/mapbox-gl-native.png
deleted file mode 100755
index 4b42cf7abf..0000000000
--- a/mapbox-gl-native.png
+++ /dev/null
diff --git a/mapbox-gl-native.pro b/mapbox-gl-native.pro
index cada3d2b45..1999a45260 100644
--- a/mapbox-gl-native.pro
+++ b/mapbox-gl-native.pro
@@ -1,8 +1,10 @@
 TARGET = qmapboxgl
 
+TEMPLATE = lib
+
 CONFIG += qt c++14 exceptions warn_off object_parallel_to_source
 
-QT += widgets network gui sql
+QT += network gui sql
 
 QMAKE_CXXFLAGS += \
     -DNDEBUG \
@@ -386,13 +388,18 @@ INCLUDEPATH += \
 QMAKE_CXXFLAGS += \
     -DMBGL_VERSION_REV=\\\"qt-v1.2.0\\\"
 
-# The demo application
-SOURCES += \
-    platform/qt/app/main.cpp \
-    platform/qt/app/mapwindow.cpp
+TestApplication {
+    TEMPLATE = app
 
-HEADERS += \
-    platform/qt/app/mapwindow.hpp
+    QT += widgets
 
-RESOURCES += \
-    platform/qt/resources/common.qrc
+    SOURCES += \
+        platform/qt/app/main.cpp \
+        platform/qt/app/mapwindow.cpp
+
+    HEADERS += \
+        platform/qt/app/mapwindow.hpp
+
+    RESOURCES += \
+        platform/qt/resources/common.qrc
+}
diff --git a/mapbox-gl-native1.png b/mapbox-gl-native1.png
new file mode 100755
index 0000000000..2182976d0b
--- /dev/null
+++ b/mapbox-gl-native1.png
diff --git a/mapbox-gl-native2.png b/mapbox-gl-native2.png
new file mode 100644
index 0000000000..56815f141b
--- /dev/null
+++ b/mapbox-gl-native2.png