From 2b6cf0417dba47be841b2f5bdfd1e758c6a145fa Mon Sep 17 00:00:00 2001
From: Peter Hartmann <peter@edelhirsch.io>
Date: Mon, 27 Apr 2020 09:24:46 +0200
Subject: [PATCH] Fix cross compilation build for ARM

* Add some INSTALLS directives to .pro files. They are used by
  QtCreator to deploy code to target devices, so it makes sense to
  deploy the examples and test support library as well.
* Add the skins plugins explicitly when adding test support;
  otherwise this won't build. This Might be a problem of the toolchain
  though.
---
 features/qskconfig.pri      | 1 +
 features/qskexample.prf     | 3 +++
 features/qsktestsupport.prf | 3 +++
 support/support.pro         | 3 +++
 4 files changed, 10 insertions(+)

diff --git a/features/qskconfig.pri b/features/qskconfig.pri
index 8f08767a..f989403c 100644
--- a/features/qskconfig.pri
+++ b/features/qskconfig.pri
@@ -23,6 +23,7 @@ QSK_INSTALL_HEADERS   = $${QSK_INSTALL_PREFIX}/include
 QSK_INSTALL_LIBS      = $${QSK_INSTALL_PREFIX}/lib
 QSK_INSTALL_BINS      = $${QSK_INSTALL_PREFIX}/bin
 QSK_INSTALL_PLUGINS   = $${QSK_INSTALL_PREFIX}/plugins
+QSK_INSTALL_EXAMPLES  = $${QSK_INSTALL_PREFIX}/examples
 
 CONFIG           += no_private_qt_headers_warning
 
diff --git a/features/qskexample.prf b/features/qskexample.prf
index 4be67fb0..53f33f30 100644
--- a/features/qskexample.prf
+++ b/features/qskexample.prf
@@ -3,3 +3,6 @@ CONFIG      += qskinny qsktestsupport
 
 DEFINES     += QSK_DLL
 DESTDIR      = $$clean_path( $${OUT_PWD}/../bin )
+
+target.path    = $${QSK_INSTALL_EXAMPLES}
+INSTALLS       = target
diff --git a/features/qsktestsupport.prf b/features/qsktestsupport.prf
index 9d03f232..02620ecc 100644
--- a/features/qsktestsupport.prf
+++ b/features/qsktestsupport.prf
@@ -5,3 +5,6 @@ DEPENDPATH  *= $${QSK_TEST_SUPPORT_DIRS}
 
 QMAKE_RPATHDIR *= $${QSK_LIB_DIR}
 qskAddLibrary( $${QSK_LIB_DIR}, qsktestsupport)
+
+qskAddLibrary( $${QSK_PLUGIN_DIR}/skins, squiekskin)
+qskAddLibrary( $${QSK_PLUGIN_DIR}/skins, materialskin)
diff --git a/support/support.pro b/support/support.pro
index f1315168..27fde42b 100644
--- a/support/support.pro
+++ b/support/support.pro
@@ -51,3 +51,6 @@ fontconfig {
 
     DEFINES += FONTCONFIG_FILE=$$clean_path( $$QSK_FONTCONF_FILE )
 }
+
+target.path    = $${QSK_INSTALL_LIBS}
+INSTALLS       = target