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.
This commit is contained in:
parent
03b2b45ca3
commit
2b6cf0417d
|
@ -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
|
||||
|
||||
|
|
|
@ -3,3 +3,6 @@ CONFIG += qskinny qsktestsupport
|
|||
|
||||
DEFINES += QSK_DLL
|
||||
DESTDIR = $$clean_path( $${OUT_PWD}/../bin )
|
||||
|
||||
target.path = $${QSK_INSTALL_EXAMPLES}
|
||||
INSTALLS = target
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -51,3 +51,6 @@ fontconfig {
|
|||
|
||||
DEFINES += FONTCONFIG_FILE=$$clean_path( $$QSK_FONTCONF_FILE )
|
||||
}
|
||||
|
||||
target.path = $${QSK_INSTALL_LIBS}
|
||||
INSTALLS = target
|
||||
|
|
Loading…
Reference in New Issue