#include "qtui.h"
#include "qtuisettings.h"
-
QtUiApplication::QtUiApplication(int &argc, char **argv)
#ifdef HAVE_KDE4
: KApplication(), // KApplication is deprecated in KF5
qInstallMsgHandler(Client::logMessage);
#else
qInstallMessageHandler(Client::logMessage);
+ connect(this, &QGuiApplication::commitDataRequest, this, &QtUiApplication::commitData, Qt::DirectConnection);
+ connect(this, &QGuiApplication::saveStateRequest, this, &QtUiApplication::saveState, Qt::DirectConnection);
+#endif
+
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+ QGuiApplication::setFallbackSessionManagementEnabled(false);
#endif
}
virtual bool init();
void resumeSessionIfPossible();
- virtual void commitData(QSessionManager &manager);
- virtual void saveState(QSessionManager &manager);
-
inline bool isAboutToQuit() const { return _aboutToQuit; }
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+ void commitData(QSessionManager &manager) override;
+ void saveState(QSessionManager &manager) override;
+#else
+ void commitData(QSessionManager &manager);
+ void saveState(QSessionManager &manager);
+#endif
+
protected:
virtual void quit();