Add support for Qt6 #8
Conversation
Deprecated for a while, no longer working in Qt6 Fixes compilation issues due deprecated usage: ../../../git/src/nemo-dbus/connection.cpp:255:22: error: invalid use of non-static member function 'const QLoggingCategory& NemoDBus::ConnectionData::logs()' | 255 | qCWarning(d->logs) << "Failed to register object on path" << path << object; Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
Fixes:
../../../git/src/plugin/declarativedbusinterface.cpp:827:39: error: 'class QJSValue' has no member named 'qjsEngine'
827 | callbackArguments << callback.qjsEngine()->toScriptValue<QVariant>(NemoDBus::demarshallDBusArgument(argument));
| ^~~~~~~~~
../../../git/src/plugin/declarativedbusinterface.cpp:827:74: error: expected primary-expression before '>' token
827 | callbackArguments << callback.qjsEngine()->toScriptValue<QVariant>(NemoDBus::demarshallDBusArgument(argument));
| ^
As per: https://forum.qt.io/topic/115844/qjsvalue-engine-deprecated-in-qt5-15
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
|
A note on your Qt6 porting: |
It's not always easy for me to determine when things were deprecated. I don't have 5.6 at my end to test. Qt's documentation isn't always accurate or complete in this regard. It seems QLoggingCategory was introduced with 5.2, but not sure if this builds with 5.6 or not since I have no way of testing it. |
| @@ -45,11 +45,13 @@ ConnectionData::ConnectionData(const QDBusConnection &connection, const QLogging | |||
| , m_logs(logs) | |||
| { | |||
| if (connection.isConnected()) { | |||
| qCDebug(logs, "Connected to %s", qPrintable(connection.name())); | |||
| QLoggingCategory logCat(logs().categoryName()); | |||
| qCDebug(logCat, "Connected to %s", qPrintable(connection.name())); | |||
There was a problem hiding this comment.
The repeated recreation of the logging category looks suspicious and I'm not either following what's the deprecated api to avoid. The qCDebug etc are the newer logging api and what I can tell it looks the same on Qt6 too.
There was a problem hiding this comment.
The repeated recreation of the logging category looks suspicious and I'm not either following what's the deprecated api to avoid. The qCDebug etc are the newer logging api and what I can tell it looks the same on Qt6 too.
@Tofee any thoughts here?
There was a problem hiding this comment.
The repeated recreation of the logging category looks suspicious and I'm not either following what's the deprecated api to avoid. The qCDebug etc are the newer logging api and what I can tell it looks the same on Qt6 too.
I can clean the recreation up a bit. The error we're seeing with Qt6 is the following
| ../../../git/src/nemo-dbus/connection.cpp: In member function 'QDBusMessage NemoDBus::ConnectionData::blockingCallMethod(const QString&, const QString&, const QString&, const QString&, const QVariantList&)':
| ../../../git/src/nemo-dbus/connection.cpp:158:13: error: invalid use of non-static member function 'const QLoggingCategory& NemoDBus::ConnectionData::logs()'
| 158 | qCDebug(logs, "DBus invocation (%s %s %s.%s)",
| | ^~~~
| ../../../recipe-sysroot/usr/include/QtCore/qloggingcategory.h:168:57: note: in definition of macro 'QT_MESSAGE_LOGGER_COMMON'
| 168 | for (QLoggingCategoryMacroHolder<level> qt_category(category); qt_category; qt_category.control = false) \
| | ^~~~~~~~
| ../../../git/src/nemo-dbus/connection.cpp:158:5: note: in expansion of macro 'qCDebug'
| 158 | qCDebug(logs, "DBus invocation (%s %s %s.%s)",
| | ^~~~~~~
| In file included from ../../../git/src/nemo-dbus/connection.h:38,
| from ../../../git/src/nemo-dbus/connection.cpp:33:
| ../../../git/src/nemo-dbus/private/connectiondata.h:115:29: note: declared here
| 115 | const QLoggingCategory &logs()
| | ^~~~
| In file included from ../../../recipe-sysroot/usr/include/QtCore/QLoggingCategory:1,
| from ../../../git/src/nemo-dbus/logging.h:36,
| from ../../../git/src/nemo-dbus/connection.cpp:36:
There was a problem hiding this comment.
@pvuorela I cleaned it up a bit now, so there's a few less QLoggingCategory. Happy to squash the 2 commits together.
There was a problem hiding this comment.
What I would expect is that there wouldn't be a single extra logging category since there's already an instance which was used earlier. Not sure what has changed on the macro declaration to break it.
Wonder if switching from qCDebug(category, const char*, ...) to qCDebug(category) << QString("..").arg() type of usage would avoid this problem. Or then there's also QLoggingCategory::operator() which talks about usage with qCDebug().
|
No update on after my adjustment suggestion so did myself an alternative PR #9 Also the QJSEngine part here was a bit off by creating a separate engine for each argument. |
|
@pvuorela Thanks for picking that up, must have slipped off my radar somehow. Let me quickly build test this on Qt6. |
Looks like a better solution to me |
Tested with Qt 6.3 and Qt 5.15, no older versions are available for testing here at my end.
Signed-off-by: Herman van Hazendonk github.com@herrie.org