]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
QLightDM: Add Qt5 version of the library: liblightdm-qt5-2
authorMichael Terry <michael.terry@canonical.com>
Thu, 7 Feb 2013 14:26:19 +0000 (09:26 -0500)
committerMichael Terry <michael.terry@canonical.com>
Thu, 7 Feb 2013 14:26:19 +0000 (09:26 -0500)
1  2 
NEWS
liblightdm-qt/usersmodel.cpp

diff --combined NEWS
index af0713ce7a956e5951ad27eac2dc70a036283cc6,dc069e7ea52a5d55628fa4c6d6478de23bff3ca0..22403181f3e517056e0e78c2172bb96ff4674450
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,7 -1,3 +1,8 @@@
 +Overview of changes in lightdm 1.6.0
 +
++    * QLightDM: Add Qt5 version of the library: liblightdm-qt5-2
 +    * QLightDM: Add some missing role names in UsersModel
 +
  Overview of changes in lightdm 1.5.0
  
      * Add man page for lightdm-set-defaults
index 8bb09a5b1e343f3613899a24a29a93d66126acd9,ae9c768a88df912fb34fbe24ca258f82028d0a2d..91f67671ee6109f0af2bf0606b6d946c3390fd9f
@@@ -182,9 -182,7 +182,9 @@@ UsersModel::UsersModel(QObject *parent
      // Extend roleNames (we want to keep the "display" role)
      QHash<int, QByteArray> roles = roleNames();
      roles[NameRole] = "name";
 +    roles[RealNameRole] = "realName";
      roles[LoggedInRole] = "loggedIn";
 +    roles[BackgroundRole] = "background";
      roles[SessionRole] = "session";
      roles[HasMessagesRole] = "hasMessages";
      roles[ImagePathRole] = "imagePath";
@@@ -243,4 -241,8 +243,8 @@@ QVariant UsersModel::data(const QModelI
  }
  
  
- #include "usersmodel_moc.cpp"
+ #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+ #include "usersmodel_moc5.cpp"
+ #else
+ #include "usersmodel_moc4.cpp"
+ #endif