From 6a82c9ba227ae8605fd92178a2de92d6acd4acac Mon Sep 17 00:00:00 2001
From: Uwe Rathmann <Uwe.Rathmann@tigertal.de>
Date: Sat, 9 Mar 2019 16:43:47 +0100
Subject: [PATCH] cleaning up qskLibraryTarget/qskAddLibrary

---
 inputcontext/inputcontext.pro |  2 +-
 qskfunctions.pri              | 48 +++++------------------------------
 skins/material/material.pro   |  2 +-
 skins/squiek/squiek.pro       |  2 +-
 4 files changed, 9 insertions(+), 45 deletions(-)

diff --git a/inputcontext/inputcontext.pro b/inputcontext/inputcontext.pro
index 675247b1..f54c30a2 100644
--- a/inputcontext/inputcontext.pro
+++ b/inputcontext/inputcontext.pro
@@ -5,7 +5,7 @@ include( $${QSK_ROOT}/qskconfig.pri )
 include( $${QSK_ROOT}/qskfunctions.pri )
 
 TEMPLATE = lib
-TARGET = $$qskLibraryTarget(qskinputcontext)
+TARGET = $$qskPluginTarget(qskinputcontext)
 
 QT += quick gui-private
 CONFIG += no_private_qt_headers_warning
diff --git a/qskfunctions.pri b/qskfunctions.pri
index f3ccc8af..4dcde4e8 100644
--- a/qskfunctions.pri
+++ b/qskfunctions.pri
@@ -3,58 +3,22 @@
 # This file may be used under the terms of the QSkinny License, Version 1.0
 ############################################################################
 
-# Copied and modified from qt_functions.prf
-
 defineReplace(qskLibraryTarget) {
 
-    unset(LIBRARY_NAME)
-    LIBRARY_NAME = $$1
+    return( $$qtLibraryTarget($$1) )
+}
 
-    contains(TEMPLATE, .*lib):CONFIG(debug, debug|release) {
+defineReplace(qskPluginTarget) {
 
-        !debug_and_release|build_pass {
-
-            mac:RET = $$member(LIBRARY_NAME, 0)_debug
-            win32:RET = $$member(LIBRARY_NAME, 0)d
-        }
-    }
-
-    isEmpty(RET):RET = $$LIBRARY_NAME
-    return($$RET)
+    return( $$qtLibraryTarget($$1) )
 }
 
 defineTest(qskAddLibrary) {
 
-    LIB_PATH = $$1
-    LIB_NAME = $$2
+    LIBS *= -L$$1
+    LIBS += -l$$2$$qtPlatformTargetSuffix()
 
-    LIBS *= -L$${LIB_PATH}
-
-    unset(LINKAGE)
-
-    isEmpty(LINKAGE) {
-
-        if(!debug_and_release|build_pass):CONFIG(debug, debug|release) {
-
-            mac:LINKAGE = -l$${LIB_NAME}_debug
-            win32:LINKAGE = -l$${LIB_NAME}d
-        }
-    }
-
-    isEmpty(LINKAGE) {
-
-        LINKAGE = -l$${LIB_NAME}
-    }
-
-    !isEmpty(QMAKE_LSB) {
-
-        QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}
-    }
-
-    LIBS += $$LINKAGE
     export(LIBS)
-    export(QMAKE_LFLAGS)
-    export(QMAKE_LIBDIR_FLAGS)
 
     return(true)
 }
diff --git a/skins/material/material.pro b/skins/material/material.pro
index f0a8b90c..01635244 100644
--- a/skins/material/material.pro
+++ b/skins/material/material.pro
@@ -1,6 +1,6 @@
 include( $${PWD}/../skins.pri )
 
-TARGET = materialskin
+TARGET = $$qskPluginTarget(materialskin)
 
 HEADERS += \
     QskMaterialGlobal.h \
diff --git a/skins/squiek/squiek.pro b/skins/squiek/squiek.pro
index a5c5eb82..cebaaf89 100644
--- a/skins/squiek/squiek.pro
+++ b/skins/squiek/squiek.pro
@@ -1,6 +1,6 @@
 include( $${PWD}/../skins.pri )
 
-TARGET = squiekskin
+TARGET = $$qskPluginTarget(squiekskin)
 
 HEADERS += \
     QskSquiekGlobal.h \