summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Olszak <olszak.tomasz@gmail.com>2015-02-26 15:41:30 +0100
committerTomasz Olszak <olszak.tomasz@gmail.com>2015-02-26 15:41:30 +0100
commite7ac60278494667fafcfedbc7b5611a470b76e5b (patch)
tree3d3b470b8e19e9543788205339614afddd366a86
parent194cf06d6a425afad7c9bb5d828b30e5eba3af3a (diff)
Revert "Tizen - handling application lifecycle"
This reverts commit 8c1b114b38275ae0620f61b9f62803cfd90fc35b. Change-Id: I4231b278e262d223d85c372521c22949e4112cb4
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp3
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.h3
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.cpp33
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp4
-rw-r--r--src/plugins/platforms/xcb/xcb-plugin.pro2
5 files changed, 0 insertions, 45 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 7b2a37239a..5510c3b1b4 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -1536,9 +1536,6 @@ static const char * xcb_atomnames = {
"Rel Vert Wheel\0"
"Rel Horiz Scroll\0"
"Rel Vert Scroll\0"
-#ifdef Q_OS_LINUX_TIZEN
- "_X_ILLUME_DEACTIVATE_WINDOW\0"
-#endif
"_XSETTINGS_SETTINGS\0"
"_COMPIZ_DECOR_PENDING\0"
"_COMPIZ_DECOR_REQUEST\0"
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index b5082852e4..7286b6b89b 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -273,9 +273,6 @@ namespace QXcbAtom {
RelHorizScroll,
RelVertScroll,
-#ifdef Q_OS_LINUX_TIZEN
- _X_ILLUME_DEACTIVATE_WINDOW,
-#endif
_XSETTINGS_SETTINGS,
_COMPIZ_DECOR_PENDING,
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 12d7ff3f54..f0c4a7f691 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -88,10 +88,6 @@
#endif
#endif
-#ifdef Q_OS_LINUX_TIZEN
-#include <aul/aul.h>
-#endif // Q_OS_LINUX_TIZEN
-
#include <QtCore/QFileInfo>
QT_BEGIN_NAMESPACE
@@ -122,38 +118,12 @@ static bool runningUnderDebugger()
#endif
}
-#ifdef Q_OS_LINUX_TIZEN
-static int aul_handler(aul_type type, bundle *, void *)
-{
- switch (type) {
- case AUL_START:
- QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationActive);
- break;
- case AUL_RESUME:
- if (!QGuiApplication::topLevelWindows().isEmpty())
- QGuiApplication::topLevelWindows().first()->requestActivate();
- break;
- case AUL_TERMINATE:
- QCoreApplication::quit();
- break;
- }
- return 0;
-}
-#endif // Q_OS_LINUX_TIZEN
-
QXcbIntegration::QXcbIntegration(const QStringList &parameters, int &argc, char **argv)
: m_services(new QGenericUnixServices)
, m_instanceName(0)
, m_canGrab(true)
{
-
qRegisterMetaType<QXcbWindow*>();
-
-#ifdef Q_OS_LINUX_TIZEN
- aul_launch_init(aul_handler, 0);
- aul_launch_argv_handler(argc, argv);
-#endif // Q_OS_LINUX_TIZEN
-
#ifdef XCB_USE_XLIB
XInitThreads();
#endif
@@ -351,9 +321,6 @@ bool QXcbIntegration::hasCapability(QPlatformIntegration::Capability cap) const
case ForeignWindows: return true;
case SyncState: return true;
case RasterGLSurface: return true;
-#ifdef Q_OS_LINUX_TIZEN
- case ApplicationState: return true;
-#endif
default: return QPlatformIntegration::hasCapability(cap);
}
}
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 8dbebb7384..00942787d9 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -1838,10 +1838,6 @@ void QXcbWindow::handleClientMessageEvent(const xcb_client_message_event_t *even
|| event->type == atom(QXcbAtom::WM_CHANGE_STATE)) {
// Ignore _NET_WM_STATE, MANAGER which are relate to tray icons
// and other messages.
-#ifdef Q_OS_LINUX_TIZEN
- } else if (event->type == atom(QXcbAtom::_X_ILLUME_DEACTIVATE_WINDOW)) {
- QWindowSystemInterface::handleApplicationStateChanged(Qt::ApplicationHidden);
-#endif // Q_OS_LINUX_TIZEN
} else if (event->type == atom(QXcbAtom::_COMPIZ_DECOR_PENDING)
|| event->type == atom(QXcbAtom::_COMPIZ_DECOR_REQUEST)
|| event->type == atom(QXcbAtom::_COMPIZ_DECOR_DELETE_PIXMAP)) {
diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro
index 7cfbe40ea8..129076c916 100644
--- a/src/plugins/platforms/xcb/xcb-plugin.pro
+++ b/src/plugins/platforms/xcb/xcb-plugin.pro
@@ -119,5 +119,3 @@ contains(QT_CONFIG, xkbcommon-qt): {
LIBS += $$QMAKE_LIBS_XKBCOMMON
QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON
}
-
-tizen:LIBS += -laul