labtoast · vo · Mar 19, 2015 · Apr 1, 2015 · Apr 1, 2015 · Apr 4, 2015
diff --git a/QGCSetup.pri b/QGCSetup.pri
@@ -28,24 +28,27 @@ COPY_RESOURCE_LIST = \
     $$BASEDIR/qml \
     $$BASEDIR/data \
     $$BASEDIR/sik_uploader
-    
+
 WindowsBuild {
-	DESTDIR_COPY_RESOURCE_LIST = $$replace(DESTDIR,"/","\\")
+    DESTDIR_COPY_RESOURCE_LIST = $$replace(DESTDIR,"/","\\")
     COPY_RESOURCE_LIST = $$replace(COPY_RESOURCE_LIST, "/","\\")
     CONCATCMD = $$escape_expand(\\n)
+    for(COPY_DIR, COPY_RESOURCE_LIST):QMAKE_POST_LINK += $$CONCATCMD $$QMAKE_COPY_DIR $${COPY_DIR} $$DESTDIR_COPY_RESOURCE_LIST"\\"$$basename(COPY_DIR)
 }
 
 LinuxBuild {
     DESTDIR_COPY_RESOURCE_LIST = $$DESTDIR
     CONCATCMD = &&
+    for(COPY_DIR, COPY_RESOURCE_LIST):QMAKE_POST_LINK += $$CONCATCMD $$QMAKE_COPY_DIR $${COPY_DIR} $$DESTDIR_COPY_RESOURCE_LIST
+
 }
 
 MacBuild {
     DESTDIR_COPY_RESOURCE_LIST = $$DESTDIR/$${TARGET}.app/Contents/MacOS
     CONCATCMD = &&
+    for(COPY_DIR, COPY_RESOURCE_LIST):QMAKE_POST_LINK += $$CONCATCMD $$QMAKE_COPY_DIR $${COPY_DIR} $$DESTDIR_COPY_RESOURCE_LIST
+
 }
-
-for(COPY_DIR, COPY_RESOURCE_LIST):QMAKE_POST_LINK += $$CONCATCMD $$QMAKE_COPY_DIR $${COPY_DIR} $$DESTDIR_COPY_RESOURCE_LIST
 
 #
 # Perform platform specific setup
@@ -71,16 +74,16 @@ WindowsBuild {
 	DebugBuild: DLL_QT_DEBUGCHAR = "d"
     ReleaseBuild: DLL_QT_DEBUGCHAR = ""
     COPY_FILE_LIST = \
-        $$BASEDIR_WIN\\libs\\lib\\sdl\\win32\\SDL.dll \
+        $$BASEDIR_WIN\\libs\\lib\\sdl\\win32\\SDL2.dll \
         $$BASEDIR_WIN\\libs\\thirdParty\\libxbee\\lib\\libxbee.dll \
         $$(QTDIR)\\bin\\Qt5WebKitWidgets$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5MultimediaWidgets$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5Multimedia$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5Gui$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5Core$${DLL_QT_DEBUGCHAR}.dll \
-        $$(QTDIR)\\bin\\icuin51.dll \
-        $$(QTDIR)\\bin\\icuuc51.dll \
-        $$(QTDIR)\\bin\\icudt51.dll \
+        $$(QTDIR)\\bin\\icuin53.dll \
+        $$(QTDIR)\\bin\\icuuc53.dll \
+        $$(QTDIR)\\bin\\icudt53.dll \
         $$(QTDIR)\\bin\\Qt5Network$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5Widgets$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5OpenGL$${DLL_QT_DEBUGCHAR}.dll \
@@ -97,22 +100,23 @@ WindowsBuild {
         $$(QTDIR)\\bin\\Qt5Script$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5Svg$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5Test$${DLL_QT_DEBUGCHAR}.dll \
+        $$(QTDIR)\\bin\\Qt5WebChannel$${DLL_QT_DEBUGCHAR}.dll \
         $$(QTDIR)\\bin\\Qt5SerialPort$${DLL_QT_DEBUGCHAR}.dll
 
     for(COPY_FILE, COPY_FILE_LIST) {
         QMAKE_POST_LINK += $$escape_expand(\\n) $$quote($$QMAKE_COPY "$$COPY_FILE" "$$COPY_FILE_DESTDIR")
     }
 
 	ReleaseBuild {
-		QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp")
-
 		# Copy Visual Studio DLLs
-		# Note that this is only done for release because the debugging versions of these DLLs cannot be redistributed.
-		# I'm not certain of the path for VS2008, so this only works for VS2010.
 		win32-msvc2010 {
 			QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 10.0\\VC\\redist\\x86\\Microsoft.VC100.CRT\\*.dll\""  "$$DESTDIR_WIN\\")
-		}
-	}
+                        QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(del /F "$$DESTDIR_WIN\\$${TARGET}.exp")
+                }
+                win32-msvc2013 {
+                        QMAKE_POST_LINK += $$escape_expand(\\n) $$quote(xcopy /D /Y "\"C:\\Program Files \(x86\)\\Microsoft Visual Studio 12.0\\VC\\redist\\x86\\Microsoft.VC120.CRT\\*.dll\""  "$$DESTDIR_WIN\\")
+                }
+        }
 }
 
 LinuxBuild {

diff --git a/README.md b/README.md
@@ -48,6 +48,8 @@ Linux
 
 Building on Linux (tested against Ubuntu 14.04 LTS):
 
+(**NOTE:** There is an error in 14.04LTS with libxcb crashing sometimes, try this [fix](https://gist.github.com/slimsag/a26d838ccc4480ce21bc))
+
 1) Install the required packages: 
 
 Be sure to run apt-get update first
@@ -57,7 +59,8 @@ sudo apt-get update
 sudo apt-get install git qt5-qmake qt5-default \
   qtscript5-dev libqt5webkit5-dev libqt5serialport5-dev \
   libqt5svg5-dev libsdl1.2-dev  libsndfile-dev \
-  flite1-dev libssl-dev libudev-dev libsdl2-dev
+  flite1-dev libssl-dev libudev-dev libsdl2-dev \
+  qtdeclarative5-qtquick2-plugin
 ```
 
 2) Clone the repository in your workspace:

diff --git a/apm_planner_version.json b/apm_planner_version.json
@@ -5,110 +5,74 @@
         {
             "platform": "osx",
             "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.15_osx.dmg",
-            "name" : "apm_planner_2.0.15_osx.dmg",
-            "version" : "2.0.15",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.17_osx.dmg",
+            "name" : "apm_planner_2.0.17_osx.dmg",
+            "version" : "2.0.17",
             "sha" : "",
-            "date" : "2014-11-18"
+            "date" : "2014-04-05"
         },
         {
             "platform": "win",
             "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.15_win.exe",
-            "name" : "apm_planner_2.0.15_win.exe",
-            "version": "2.0.15",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.17_win.exe",
+            "name" : "apm_planner_2.0.17_win.exe",
+            "version": "2.0.17",
             "sha" : "",
-            "date" : "2014-11-18"
-        },
-        {
-            "platform": "debian",
-            "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.14_debian.deb",
-            "name" : "apm_planner_2.0.14_debian.deb",
-            "version": "2.0.14",
-            "sha" : "",
-            "date" : "2014-08-01"
-        },
-        {
-            "platform": "debian64",
-            "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.14_debian64.deb",
-            "name" : "apm_planner_2.0.14_debian64.deb",
-            "version": "2.0.14",
-            "sha" : "",
-            "date" : "2014-08-01"
-        },
-        {
-            "platform": "ubuntu",
-            "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.14_ubuntu.deb",
-            "name" : "apm_planner_2.0.14_ubuntu.deb",
-            "version": "2.0.14",
-            "sha" : "",
-            "date" : "2014-08-01"
-        },
-        {
-            "platform": "ubuntu64",
-            "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.14_ubuntu64.deb",
-            "name" : "apm_planner_2.0.14_ubuntu64.deb",
-            "version": "2.0.14",
-            "sha" : "",
-            "date" : "2014-08-01"
+            "date" : "2014-04-05"
         },
         {
             "platform": "ubuntu_trusty",
             "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.15_ubuntu_trusty.deb",
-            "name" : "apm_planner_2.0.15_ubuntu_trusty.deb",
-            "version": "2.0.15",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.17_ubuntu_trusty.deb",
+            "name" : "apm_planner_2.0.17_ubuntu_trusty.deb",
+            "version": "2.0.17",
             "sha" : "",
-            "date" : "2014-11-18"
+            "date" : "2014-04-05"
         },
         {
             "platform": "ubuntu_trusty64",
             "type": "stable",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.15_ubuntu_trusty64.deb",
-            "name" : "apm_planner_2.0.15_ubuntu_trusty64.deb",
-            "version": "2.0.15",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/apm_planner_2.0.17_ubuntu_trusty64.deb",
+            "name" : "apm_planner_2.0.17_ubuntu_trusty64.deb",
+            "version": "2.0.17",
             "sha" : "",
-            "date" : "2014-11-18"
+            "date" : "2014-04-05"
         },
         {
             "platform": "osx",
             "type": "beta",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.16-rc3_osx.dmg",
-            "name" : "apm_planner_2.0.16-rc3_osx.dmg",
-            "version" : "2.0.16-rc3",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.18-rc2_osx.dmg",
+            "name" : "apm_planner_2.0.18-rc2_osx.dmg",
+            "version" : "2.0.18-rc2",
             "sha" : "",
-            "date" : "2015-02-06"
+            "date" : "2015-06-17"
         },
         {
             "platform": "win",
             "type": "beta",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.16-rc3_win.exe",
-            "name" : "apm_planner_2.0.16-rc3_win.exe",
-            "version": "2.0.16-rc3",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.18-rc2_win.exe",
+            "name" : "apm_planner_2.0.18-rc2_win.exe",
+            "version": "2.0.18-rc2",
             "sha" : "",
-            "date" : "2015-02-06"
+            "date" : "2015-06-17"
         },
         {
             "platform": "ubuntu_trusty",
             "type": "beta",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.16-rc3_ubuntu_trusty.deb",
-            "name" : "apm_planner_2.0.16-rc3_ubuntu_trusty.deb",
-            "version": "2.0.16-rc3",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.18-rc2_ubuntu_trusty.deb",
+            "name" : "apm_planner_2.0.18-rc2_ubuntu_trusty.deb",
+            "version": "2.0.18-rc2",
             "sha" : "",
-            "date" : "2015-02-06"
+            "date" : "2015-06-17"
         },
         {
             "platform": "ubuntu_trusty64",
             "type": "beta",
-            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.16-rc3_ubuntu_trusty64.deb",
-            "name" : "apm_planner_2.0.16-rc3_ubuntu_trusty64.deb",
-            "version": "2.0.16-rc3",
+            "url": "http://firmware.diydrones.com/Tools/APMPlanner/beta/apm_planner_2.0.18-rc2_ubuntu_trusty64.deb",
+            "name" : "apm_planner_2.0.18-rc2_ubuntu_trusty64.deb",
+            "version": "2.0.18-rc2",
             "sha" : "",
-            "date" : "2015-02-06"
+            "date" : "2015-06-17"
         }
     ]
 }
diff --git a/libs/lib/sdl/include/SDL2/SDL_platform.h b/libs/lib/sdl/include/SDL2/SDL_platform.h
@@ -114,10 +114,10 @@
 #define __SOLARIS__ 1
 #endif
 
-#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) || defined(__MINGW32__)
+#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
 /* Try to find out if we're compiling for WinRT or non-WinRT */
 /* If _USING_V110_SDK71_ is defined it means we are using the v110_xp or v120_xp toolset. */
-#if (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_)	/* _MSC_VER==1700 for MSVC 2012 */
+#if defined(__MINGW32__) || (defined(_MSC_VER) && (_MSC_VER >= 1700) && !_USING_V110_SDK71_)	/* _MSC_VER==1700 for MSVC 2012 */
 #include <winapifamily.h>
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 #undef __WINDOWS__

diff --git a/libs/lib/sdl/msvc/lib/SDL2.dll b/libs/lib/sdl/msvc/lib/SDL2.dll
diff --git a/libs/lib/sdl/msvc/lib/SDL2.lib b/libs/lib/sdl/msvc/lib/SDL2.lib
diff --git a/libs/lib/sdl/msvc/lib/SDL2main.lib b/libs/lib/sdl/msvc/lib/SDL2main.lib
diff --git a/libs/lib/sdl/msvc/lib/SDL2test.lib b/libs/lib/sdl/msvc/lib/SDL2test.lib
diff --git a/libs/opmapcontrol/src/core/opmaps.cpp b/libs/opmapcontrol/src/core/opmaps.cpp
@@ -39,7 +39,7 @@ namespace core {
     OPMaps::OPMaps():RetryLoadTile(2),useMemoryCache(true)
     {
         accessmode=AccessMode::ServerAndCache;
-        Language=LanguageType::PortuguesePortugal;
+        Language=LanguageType::English;
         LanguageStr=LanguageType().toShortString(Language);
         Cache::Instance();
 
@@ -221,6 +221,9 @@ namespace core {
                 tT.stop();
                 if( (reply->error()!=QNetworkReply::NoError))
                 {
+#ifdef DEBUG_GMAPS
+                    qDebug() << " Download Tile Network error: " << reply->errorString();
+#endif
                     errorvars.lock();
                     ++diag.networkerrors;
                     errorvars.unlock();

diff --git a/libs/opmapcontrol/src/core/providerstrings.cpp b/libs/opmapcontrol/src/core/providerstrings.cpp
@@ -42,10 +42,10 @@ namespace core {
 //        VersionGoogleLabels = "h@132";
 //        VersionGoogleTerrain = "t@125,r@132";
         // Google version strings
-        VersionGoogleMap = "m@284";
-        VersionGoogleSatellite = "163";
-        VersionGoogleLabels = "h@284";
-        VersionGoogleTerrain = "t@132,r@284";
+        VersionGoogleMap = "m@301";
+        VersionGoogleSatellite = "171";
+        VersionGoogleLabels = "h@301";
+        VersionGoogleTerrain = "t@132,r@301";
         SecGoogleWord = "Galileo";
 
         // Google (China) version strings