Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixup build on qt6 #6

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixup build on qt6 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/daemon/daemon.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ QT -= gui
QT += dbus

CONFIG += \
c++11 \
c++17 \
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At least when i make apps for SFOS, their Qt version does not recognize c++17 as CONFIG, so i had to resort to QMAKE_CXXFLAGS += -std=c++17.
(And c++11 maps to -std=gnu++0x)

link_pkgconfig

PKGCONFIG += \
Expand Down
4 changes: 2 additions & 2 deletions src/nemo-devicelock/host/host.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ TARGET = nemodevicelock-host

CONFIG += \
static \
c++11 \
c++17 \
link_pkgconfig

QT -= gui
QT += dbus
QT += core dbus

PKGCONFIG += \
dbus-1 \
Expand Down
4 changes: 3 additions & 1 deletion src/nemo-devicelock/host/hostservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@ namespace NemoDeviceLock

class ConnectionMonitor : public QObject
{
#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0))
Q_OBJECT
#endif
public:
ConnectionMonitor(HostService *service, const QString &connectionName)
: QObject(service)
Expand Down Expand Up @@ -201,4 +203,4 @@ void HostService::nameLost(const QString &name)

}

#include "hostservice.moc"
//#include "hostservice.moc"
2 changes: 1 addition & 1 deletion src/nemo-devicelock/host/nemo-devicelock-host.prf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
QT *= dbus

CONFIG *= \
c++11 \
c++17 \
link_pkgconfig

PKGCONFIG += \
Expand Down
2 changes: 1 addition & 1 deletion src/nemo-devicelock/lib.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = nemodevicelock

CONFIG += \
c++11 \
c++17 \
hide_symbols \
link_pkgconfig \
create_pc \
Expand Down
2 changes: 1 addition & 1 deletion src/plugin/plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Q_DECL_EXPORT NemoDeviceLockPlugin : public QQmlExtensionPlugin
qDBusRegisterMetaType<NemoDeviceLock::Fingerprint>();
qDBusRegisterMetaType<QVector<NemoDeviceLock::Fingerprint>>();

qmlRegisterType<NemoDeviceLock::FingerprintModel>();
// qmlRegisterType<NemoDeviceLock::FingerprintModel>();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentionally disabled and will this cause issues?


qmlRegisterSingletonType<NemoDeviceLock::DeviceLock>(uri, 1, 0, "DeviceLock", createDeviceLock);

Expand Down
2 changes: 1 addition & 1 deletion src/plugin/plugin.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ QT += dbus qml
CONFIG += \
plugin \
hide_symbols \
c++11 \
c++17 \
link_pkgconfig

INCLUDEPATH += \
Expand Down