peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Qt6 incompatibilities fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2020-10-29 07:49:53 +01:00
parent 9a3e8d0d2d
commit 1e1093868d
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qmlexport/QskQml.cpp
View File

@ -72,24 +72,6 @@ QSK_QT_PRIVATE_END
qmlRegisterSingletonType< className >( QSK_MODULE_NAME, 1, 0, typeName, \ qmlRegisterSingletonType< className >( QSK_MODULE_NAME, 1, 0, typeName, \
[] ( QQmlEngine*, QJSEngine* ) { return dynamic_cast< QObject* >( singleton ); } ) [] ( QQmlEngine*, QJSEngine* ) { return dynamic_cast< QObject* >( singleton ); } )
#if 0
// Utility for exposing a namespaced enum to QML, copied from qmlRegisterUncreatableType
#define QSK_REGISTER_NS_ENUM( namespaceName, enumName, typeName ) \
{ \
namespace T = namespaceName; \
QML_GETTYPENAMES \
QQmlPrivate::RegisterType type = \
{ \
1, qRegisterNormalizedMetaType< T::enumName* >( pointerName.constData() ), \
qRegisterNormalizedMetaType< QQmlListProperty< T::enumName > >( listName.constData() ), \
0, nullptr, QString(), QSK_MODULE_NAME, 1, 0, typeName, &T::staticMetaObject, \
nullptr, nullptr, -1, -1, -1, nullptr, nullptr, nullptr, 0 \
}; \
(void) QQmlPrivate::qmlregister(QQmlPrivate::TypeRegistration, &type); \
(void) qRegisterMetaType< namespaceName::enumName >(); \
}
#endif
// Expose values in QskRgbValue to QML // Expose values in QskRgbValue to QML
struct QskRgbValue_Gadget struct QskRgbValue_Gadget
{ {
@ -163,22 +145,22 @@ class QskMain : public QObject
this, nullptr, this, nullptr,
[]( QQmlListProperty< QObject >* property, QObject* value ) []( QQmlListProperty< QObject >* property, QObject* value )
{ {
QskMain* main = static_cast< QskMain* >( property->object ); auto main = static_cast< QskMain* >( property->object );
main->m_data.append( value ); main->m_data.append( value );
}, },
[]( QQmlListProperty< QObject >* property ) []( QQmlListProperty< QObject >* property )
{ {
const QskMain* main = static_cast< const QskMain* >( property->object ); auto main = static_cast< const QskMain* >( property->object );
return main->m_data.count(); return static_cast< int >( main->m_data.count() );
}, },
[]( QQmlListProperty< QObject >* property, int index ) []( QQmlListProperty< QObject >* property, int index )
{ {
const QskMain* main = static_cast< const QskMain* >( property->object ); auto main = static_cast< const QskMain* >( property->object );
return main->m_data.at( index ); return main->m_data.at( index );
}, },
[]( QQmlListProperty< QObject >* property ) []( QQmlListProperty< QObject >* property )
{ {
QskMain* main = static_cast< QskMain* >( property->object ); auto main = static_cast< QskMain* >( property->object );
main->m_data.clear(); main->m_data.clear();
} }
); );