diff options
author | Rainer Keller <rainer.keller@digia.com> | 2014-02-04 08:39:39 +0100 |
---|---|---|
committer | Rainer Keller <rainer.keller@digia.com> | 2014-02-04 13:42:36 +0200 |
commit | 10a216b9ce083e369f47e8ebb42a763de09bb10f (patch) | |
tree | 6302ecd5cfc2cae3681a2380a5e7b52d16f8c580 | |
parent | 6eb9410b87642510502c3540d0d4ab5cac05cd24 (diff) |
Remove emulator specific workarounds
The graphic issues are solved now and thus these workarounds are not
needed anymore.
Change-Id: I7ce39b51ac8fb5386b60440238b7e8be5771d7e4
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
-rw-r--r-- | qml/ApplicationIcon.qml | 4 | ||||
-rw-r--r-- | qml/GlimmeringQtLogo.qml | 8 | ||||
-rw-r--r-- | src/engine.cpp | 6 | ||||
-rw-r--r-- | src/engine.h | 4 |
4 files changed, 5 insertions, 17 deletions
diff --git a/qml/ApplicationIcon.qml b/qml/ApplicationIcon.qml index ed0bf2a..1682416 100644 --- a/qml/ApplicationIcon.qml +++ b/qml/ApplicationIcon.qml @@ -34,13 +34,13 @@ Item { source: icon asynchronous: true anchors.fill: parent - visible: engine.runningInEmulator + visible: false } ShaderEffect { id: shader - visible: preview.status == Image.Ready && !engine.runningInEmulator; + visible: preview.status == Image.Ready anchors.fill: parent property variant source: preview diff --git a/qml/GlimmeringQtLogo.qml b/qml/GlimmeringQtLogo.qml index 70d316c..6a06505 100644 --- a/qml/GlimmeringQtLogo.qml +++ b/qml/GlimmeringQtLogo.qml @@ -31,23 +31,21 @@ Item { height: width * sourceSize.height / sourceSize.width; source: "images/qt-logo.png" - visible: engine.runningInEmulator + visible: false } HighlightShader { source: image - running: !engine.runningInEmulator + running: true interval: 10000 anchors.fill: image; - visible: !engine.runningInEmulator - } ParticleSystem { id: starSystem; anchors.fill: image - running: visible && !engine.runningInEmulator + running: visible ImageParticle { id: starParticle diff --git a/src/engine.cpp b/src/engine.cpp index c9298e6..90f2fe8 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -64,12 +64,6 @@ Engine::Engine(QObject *parent) } -bool Engine::runningInEmulator() const -{ - return QFile::exists("/system/lib/egl_gallium.so"); -} - - void Engine::updateReadyness() { if (!m_intro_done) diff --git a/src/engine.h b/src/engine.h index de1aa6f..9e950e4 100644 --- a/src/engine.h +++ b/src/engine.h @@ -46,8 +46,6 @@ class Engine : public QObject Q_PROPERTY(const QString qtVersion READ qtVersion) - Q_PROPERTY(bool runningInEmulator READ runningInEmulator CONSTANT) - public: explicit Engine(QObject *parent = 0); @@ -73,8 +71,6 @@ public: void setWindow(QQuickWindow *window) { m_window = window; } - bool runningInEmulator() const; - Q_INVOKABLE int sensibleButtonSize() const; Q_INVOKABLE int titleBarSize() const; Q_INVOKABLE int smallFontSize() const { return qMax<int>(m_dpcm * 0.4, 10); } |