diff --git a/examples/example.pri b/examples/example.pri index 9229472e..fdaffa74 100644 --- a/examples/example.pri +++ b/examples/example.pri @@ -24,9 +24,6 @@ QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport) qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) -win32 { - contains(QSK_CONFIG, QskDll) { - DEFINES += QT_DLL QSK_DLL - } +contains(QSK_CONFIG, QskDll) { + DEFINES += QSK_DLL } - diff --git a/features/qskconfig.pri b/features/qskconfig.pri index a3b4a595..89c38be5 100644 --- a/features/qskconfig.pri +++ b/features/qskconfig.pri @@ -24,6 +24,8 @@ QSK_INSTALL_LIBS = $${QSK_INSTALL_PREFIX}/lib QSK_INSTALL_BINS = $${QSK_INSTALL_PREFIX}/bin QSK_INSTALL_PLUGINS = $${QSK_INSTALL_PREFIX}/plugins +CONFIG += no_private_qt_headers_warning + CONFIG += warn_on CONFIG += no_keywords CONFIG += silent @@ -32,6 +34,7 @@ CONFIG -= depend_includepath CONFIG += strict_c++ CONFIG += c++11 CONFIG += pedantic +CONFIG += hide_symbols # CONFIG += debug # CONFIG += sanitize diff --git a/inputcontext/inputcontext.pro b/inputcontext/inputcontext.pro index 9d984462..2f9c3cd0 100644 --- a/inputcontext/inputcontext.pro +++ b/inputcontext/inputcontext.pro @@ -66,7 +66,7 @@ hunspell { } contains(QSK_CONFIG, QskDll) { - DEFINES += QT_DLL QSK_DLL QSK_INPUTCONTEXT_MAKEDLL + DEFINES += QSK_DLL QSK_INPUTCONTEXT_MAKEDLL } target.path = $${QSK_INSTALL_PLUGINS}/platforminputcontexts diff --git a/playground/playground.pri b/playground/playground.pri index 6d23ef5c..72204ff4 100644 --- a/playground/playground.pri +++ b/playground/playground.pri @@ -26,9 +26,6 @@ QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport) qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) -win32 { - contains(QSK_CONFIG, QskDll) { - DEFINES += QT_DLL QSK_DLL - } +contains(QSK_CONFIG, QskDll) { + DEFINES += QSK_DLL } - diff --git a/playground/webview/webview.pro b/playground/webview/webview.pro index 3a788c32..18244191 100644 --- a/playground/webview/webview.pro +++ b/playground/webview/webview.pro @@ -1,7 +1,6 @@ include( $${PWD}/../playground.pri ) -QT += webengine -QT += webengine-private +QT += webengine webengine-private TARGET = webview diff --git a/qmlexport/qmlexport.pro b/qmlexport/qmlexport.pro index 7c2a40c5..173059d7 100644 --- a/qmlexport/qmlexport.pro +++ b/qmlexport/qmlexport.pro @@ -10,7 +10,6 @@ DESTDIR = $${QSK_OUT_ROOT}/lib qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) QT += quick quick-private -CONFIG += no_private_qt_headers_warning contains(QSK_CONFIG, QskDll) { diff --git a/skins/skins.pri b/skins/skins.pri index 71abfcda..ebb63f42 100644 --- a/skins/skins.pri +++ b/skins/skins.pri @@ -25,7 +25,7 @@ DESTDIR = $${QSK_OUT_ROOT}/plugins/skins qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) contains(QSK_CONFIG, QskDll) { - DEFINES += QT_DLL QSK_DLL + DEFINES += QSK_DLL } target.path = $${QSK_INSTALL_PLUGINS}/skins diff --git a/src/graphic/QskStandardSymbol.h b/src/graphic/QskStandardSymbol.h index fa012423..261a49c5 100644 --- a/src/graphic/QskStandardSymbol.h +++ b/src/graphic/QskStandardSymbol.h @@ -11,7 +11,7 @@ class QskGraphic; -class QskStandardSymbol +class QSK_EXPORT QskStandardSymbol { Q_GADGET diff --git a/src/src.pro b/src/src.pro index 55e0c408..6fdcada8 100644 --- a/src/src.pro +++ b/src/src.pro @@ -8,7 +8,6 @@ VERSION = $${QSK_VERSION} DESTDIR = $${QSK_OUT_ROOT}/lib QT += quick quick-private -CONFIG += no_private_qt_headers_warning contains(QSK_CONFIG, QskDll) { diff --git a/tools/svg2qvg/svg2qvg.pro b/tools/svg2qvg/svg2qvg.pro index 36526120..827a2ce1 100644 --- a/tools/svg2qvg/svg2qvg.pro +++ b/tools/svg2qvg/svg2qvg.pro @@ -28,7 +28,7 @@ standalone { } else { - LIBS *= -L$${QSK_OUT_ROOT}/lib -lqskinny + qskAddLibrary( $${QSK_OUT_ROOT}/lib, qskinny ) contains(QSK_CONFIG, QskDll) { DEFINES += QSK_DLL