From 3a793264f53aa0889b2be2a883f00af32ddacbc4 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Wed, 8 Apr 2015 10:25:12 -0700
Subject: [PATCH] Get rid of $$qtlibrarytarget

This just mangles the library names for no good reason.
---
 QGCApplication.pro    | 24 +++---------------------
 QGCLocationPlugin.pro |  2 +-
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/QGCApplication.pro b/QGCApplication.pro
index 134c24f..0732ea7 100644
--- a/QGCApplication.pro
+++ b/QGCApplication.pro
@@ -36,32 +36,14 @@ message(BASEDIR $$BASEDIR DESTDIR $$DESTDIR TARGET $$TARGET)
 # QGC QtLocation plugin
 
 LIBS += -L$${LOCATION_PLUGIN_DESTDIR}
+LIBS += -l$${LOCATION_PLUGIN_NAME}
 
-LinuxBuild {
-    LIBS += -l$${LOCATION_PLUGIN_NAME}
+LinuxBuild|MacBuild {
     PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a
 }
 
 WindowsBuild {
-    DebugBuild {
-        LIBS += -l$${LOCATION_PLUGIN_NAME}d
-        PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}d.lib
-    }
-    ReleaseBuild {
-        LIBS += -l$${LOCATION_PLUGIN_NAME}
-        PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib
-    }
-}
-
-MacBuild {
-    DebugBuild {
-        LIBS += -l$${LOCATION_PLUGIN_NAME}_debug
-        PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}_debug.a
-    }
-    ReleaseBuild {
-        LIBS += -l$${LOCATION_PLUGIN_NAME}
-        PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/lib$${LOCATION_PLUGIN_NAME}.a
-    }
+    PRE_TARGETDEPS += $${LOCATION_PLUGIN_DESTDIR}/$${LOCATION_PLUGIN_NAME}.lib
 }
 
 # Qt configuration
diff --git a/QGCLocationPlugin.pro b/QGCLocationPlugin.pro
index fb2f761..e2da91a 100644
--- a/QGCLocationPlugin.pro
+++ b/QGCLocationPlugin.pro
@@ -1,7 +1,7 @@
 include(QGCCommon.pri)
 
 TEMPLATE     = lib
-TARGET       = $$qtLibraryTarget(QGeoServiceProviderFactoryQGC)
+TARGET       = QGeoServiceProviderFactoryQGC
 CONFIG      += plugin static
 QT          += location-private positioning-private network
 PLUGIN_TYPE  = geoservices