summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>2012-04-11 19:31:39 -0700
committerQt by Nokia <qt-info@nokia.com>2012-04-12 15:36:10 +0200
commit93c960876af2aebc265ffe3ddc12a24325fc512e (patch)
tree2b6af9a0d4c6b049d309ff96b89ab1a143269250
parentdd2429551ed6fee49f092001c58b953e72d139c3 (diff)
Remove redundant platformNativeInterface()
platformNativeInterface() is already defined in QGuiApplication. Change-Id: Ice720fb6f7e4b01c4627219d66a5a3c8980a79a5 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/widgets/kernel/qapplication.h2
-rw-r--r--src/widgets/kernel/qapplication_qpa.cpp6
2 files changed, 0 insertions, 8 deletions
diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h
index 3e11db0863..31d228ddd5 100644
--- a/src/widgets/kernel/qapplication.h
+++ b/src/widgets/kernel/qapplication.h
@@ -175,8 +175,6 @@ public:
static bool isEffectEnabled(Qt::UIEffect);
static void setEffectEnabled(Qt::UIEffect, bool enable = true);
- static QPlatformNativeInterface *platformNativeInterface();
-
#ifndef QT_NO_SESSIONMANAGER
// session management
bool isSessionRestored() const;
diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index 92b831101f..fa84e86f29 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -437,12 +437,6 @@ void QApplication::alert(QWidget *, int)
{
}
-QPlatformNativeInterface *QApplication::platformNativeInterface()
-{
- QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
- return pi->nativeInterface();
-}
-
void qt_init(QApplicationPrivate *priv, int type)
{
Q_UNUSED(priv);