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

diff --git a/greeters/qt/panel.cpp b/greeters/qt/panel.cpp
index 30917674a70e3928ae68bf4c44ca13d7606f5045..41a78d461ce3218b43da698687918240070e9bc3 100644 (file)
--- a/greeters/qt/panel.cpp
+++ b/greeters/qt/panel.cpp
@@ -13,7 +13,7 @@
 #include "ui_panel.h"
 
 #include <QLightDM/Greeter>
-#include <QLightDM/Session>
+#include <QLightDM/SessionsModel>
 #include <QLightDM/Power>
 
 #include <QMenu>

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
new file mode 100644 (file)
index 0000000..026b8d4
--- /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 cf47ec59e558af27e642306c141624905119c447..7db5c2cc93fad8f63f51108765d8720970a60c2a 100644 (file)
--- 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 058e6b59a5b185f67a215a95ff24c08b900fef95..cd4b2a49ba22df8b117e74824fa5efc2984cd7a8 100644 (file)
--- 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 b76426fcdab37fdf63d174ccb76fb6690a39611e..dcd3b58b9174c9ead5cc63134c3975a9af3dd4fc 100644 (file)
--- 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;