diff --git a/README.md b/README.md index dcdc8065..89e64fb8 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ controls is limited to the needs of the driving projects. QSkinny is supposed to run on all platforms being supported by Qt/Quick. But so far only Linux is actively tested. -It might support all versions Qt >= 5.12, but you can rely on: +It might support all versions Qt >= 5.15, but you can rely on: - Qt 5.15 - current long term supported ( LTS ) version of Qt diff --git a/qmlexport/QskQml.hpp b/qmlexport/QskQml.hpp index d1576d9d..c120ee65 100644 --- a/qmlexport/QskQml.hpp +++ b/qmlexport/QskQml.hpp @@ -7,11 +7,6 @@ #define QSK_QML_HPP #include - -#if QT_VERSION < QT_VERSION_CHECK( 5, 14, 0 ) - #include -#endif - #include #define QSK_MODULE_NAME "Skinny" @@ -273,20 +268,8 @@ namespace QskQml { const auto name = classNameQml( T::staticMetaObject ); -#if QT_VERSION < QT_VERSION_CHECK( 5, 14, 0 ) - auto callback = - []( QQmlEngine*, QJSEngine* ) - { - QQmlEngine::setObjectOwnership( singleton, QQmlEngine::CppOwnership ); - return singleton; - }; - - return qmlRegisterSingletonType< T >( QSK_MODULE_NAME, - QSK_VERSION_MAJOR, QSK_VERSION_MINOR, name, callback ); -#else return qmlRegisterSingletonInstance( QSK_MODULE_NAME, QSK_VERSION_MAJOR, QSK_VERSION_MINOR, name, singleton ); -#endif } } diff --git a/src/common/QskMetaFunction.cpp b/src/common/QskMetaFunction.cpp index cef8eaba..7d817cb9 100644 --- a/src/common/QskMetaFunction.cpp +++ b/src/common/QskMetaFunction.cpp @@ -55,11 +55,7 @@ int QskMetaFunction::FunctionCall::typeInfo() const int QskMetaFunction::FunctionCall::refCount() const { auto that = const_cast< FunctionCall* >( this ); -#if QT_VERSION >= QT_VERSION_CHECK( 5, 14, 0 ) return reinterpret_cast< SlotObject* >( that )->ref.loadRelaxed(); -#else - return reinterpret_cast< SlotObject* >( that )->ref.load(); -#endif } QskMetaFunction::QskMetaFunction()