diff options
author | Aurelien Gateau <aurelien.gateau@canonical.com> | 2011-11-28 14:57:49 +0100 |
---|---|---|
committer | Aurelien Gateau <aurelien.gateau@canonical.com> | 2011-11-28 14:57:49 +0100 |
commit | c2b9194d246f796f8ee66a93d94fe1f47f2466e0 (patch) | |
tree | 23ce52970bb4b8dd182e8c9872a5ccb6c185b0ab /liblightdm-qt | |
parent | 5da2969ba87b29c4079e997807f4d9495e2ffdad (diff) | |
download | lightdm-c2b9194d246f796f8ee66a93d94fe1f47f2466e0.tar.gz |
Fix build:
- Bring back liglightdm-qt/Makefile.am
- #include <lightdm-gobject-1/lightdm.h> => #include <lightdm.h>
- Adjust qt greeter code to liblightdm-qt changes
Diffstat (limited to 'liblightdm-qt')
-rw-r--r-- | liblightdm-qt/Makefile.am | 51 | ||||
-rw-r--r-- | liblightdm-qt/greeter.cpp | 4 | ||||
-rw-r--r-- | liblightdm-qt/sessionsmodel.cpp | 2 | ||||
-rw-r--r-- | liblightdm-qt/usersmodel.cpp | 2 |
4 files changed, 55 insertions, 4 deletions
diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am new file mode 100644 index 00000000..026b8d40 --- /dev/null +++ b/liblightdm-qt/Makefile.am @@ -0,0 +1,51 @@ +lib_LTLIBRARIES = liblightdm-qt-1.la + +%_moc.cpp: QLightDM/%.h + $(MOC) $< -o $@ + +power.cpp: power_moc.cpp +greeter.cpp: greeter_moc.cpp +sessionsmodel.cpp: sessionsmodel_moc.cpp +usersmodel.cpp: usersmodel_moc.cpp + +liblightdm_qt_1_la_LIBADD = \ + $(LIBLIGHTDM_QT_LIBS) \ + -L$(top_builddir)/liblightdm-gobject \ + -llightdm-gobject-1 + +liblightdm_qt_1_la_CXXFLAGS = $(LIBLIGHTDM_QT_CFLAGS) \ + -I$(top_srcdir)/liblightdm-gobject \ + $(LIBLIGHTDM_GOBJECT_CFLAGS) \ + -DXSESSIONS_DIR=\"$(datadir)/xsessions\" + +liblightdm_qt_1include_HEADERS = \ + QLightDM/Greeter \ + QLightDM/Power \ + QLightDM/SessionsModel \ + QLightDM/System \ + QLightDM/UsersModel \ + QLightDM/greeter.h \ + QLightDM/power.h \ + QLightDM/sessionsmodel.h \ + QLightDM/system.h \ + QLightDM/usersmodel.h + +liblightdm_qt_1includedir=$(includedir)/lightdm-qt-1/QLightDM + +liblightdm_qt_1_la_SOURCES = \ + greeter.cpp \ + power.cpp \ + sessionsmodel.cpp \ + system.cpp \ + usersmodel.cpp \ + $(liblightdm_qt_1include_HEADERS) + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = liblightdm-qt-1.pc + +CLEANFILES = \ + *_moc.cpp + +DISTCLEANFILES = \ + Makefile.in \ + $(pkgconfig_DATA) diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp index cf47ec59..7db5c2cc 100644 --- a/liblightdm-qt/greeter.cpp +++ b/liblightdm-qt/greeter.cpp @@ -18,7 +18,7 @@ #include <QtCore/QVariant> #include <QtCore/QSettings> -#include <lightdm-gobject-1/lightdm.h> +#include <lightdm.h> using namespace QLightDM; @@ -165,7 +165,7 @@ bool Greeter::startSessionSync(const QString &session) QString Greeter::getHint(const QString &name) const { - Q_D(Greeter()); + Q_D(const Greeter); return lightdm_greeter_get_hint(d->ldmGreeter, name.toLocal8Bit().constData()); } diff --git a/liblightdm-qt/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp index 058e6b59..cd4b2a49 100644 --- a/liblightdm-qt/sessionsmodel.cpp +++ b/liblightdm-qt/sessionsmodel.cpp @@ -14,7 +14,7 @@ #include <QtCore/QVariant> #include <QtCore/QDebug> -#include <lightdm-gobject-1/lightdm.h> +#include <lightdm.h> using namespace QLightDM; diff --git a/liblightdm-qt/usersmodel.cpp b/liblightdm-qt/usersmodel.cpp index b76426fc..dcd3b58b 100644 --- a/liblightdm-qt/usersmodel.cpp +++ b/liblightdm-qt/usersmodel.cpp @@ -15,7 +15,7 @@ #include <QtCore/QDebug> #include <QtGui/QPixmap> -#include <lightdm-gobject-1/lightdm.h> +#include <lightdm.h> using namespace QLightDM; |