Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Allow QML Quit buttons to work inside QtDemo.
  Fix minehunt demo for Symbian
  Add a quit button to declarative examples in QtDemo
  Without Declarative, still build and run QtDemo

13 files changed, 285 insertions, 195 deletions

diff --git a/demos/declarative/minehunt/MinehuntCore/qmldir b/demos/declarative/minehunt/MinehuntCore/qmldir
index 2beccf9..81980e0 100644
--- a/demos/declarative/minehunt/MinehuntCore/qmldir
+++ b/demos/declarative/minehunt/MinehuntCore/qmldir
@@ -1,3 +1,2 @@
-plugin qmlminehuntplugin
 Explosion 1.0 Explosion.qml
 Tile 1.0 Tile.qml
diff --git a/demos/declarative/minehunt/README b/demos/declarative/minehunt/README
index b9f1d2a..3849ca5 100644
--- a/demos/declarative/minehunt/README
+++ b/demos/declarative/minehunt/README
@@ -1,3 +1,6 @@
-To compile the C++ part, do 'qmake && make'. Minehunt will not run properly if the C++ plugin is not compiled.
+Minehunt has to be compiled to run.
+
+To compile the C++ part, do 'qmake && make'.
+To run, simply run the executable.
+To deploy on a device, do 'make sis'.
 
-To run, simply load the minehunt.qml file with the qml runtime.
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp
new file mode 100644
index 0000000..fc223dd
--- /dev/null
+++ b/demos/declarative/minehunt/main.cpp
@@ -0,0 +1,70 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtGui/QApplication>
+#include <QtDeclarative/QDeclarativeView>
+#include <QtDeclarative/QDeclarativeContext>
+#include <QtDeclarative/QDeclarativeEngine>
+
+#include "minehunt.h"
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+    QDeclarativeView canvas;
+    
+    qmlRegisterType<TileData>();
+    MinehuntGame* game = new MinehuntGame();
+    
+#ifdef Q_OS_SYMBIAN
+    canvas.setResizeMode(QDeclarativeView::SizeRootObjectToView);
+#endif
+    canvas.engine()->rootContext()->setContextObject(game);        
+    canvas.setSource(QString("minehunt.qml"));
+    
+#ifdef Q_OS_SYMBIAN
+    canvas.showFullScreen();
+#else
+    canvas.setGeometry(QRect(100, 100, 450, 450));
+    canvas.show();
+#endif
+    return app.exec();
+}
diff --git a/demos/declarative/minehunt/minehunt.cpp b/demos/declarative/minehunt/minehunt.cpp
index 2a4ed10..9c82f30 100644
--- a/demos/declarative/minehunt/minehunt.cpp
+++ b/demos/declarative/minehunt/minehunt.cpp
@@ -40,99 +40,10 @@
 ****************************************************************************/
 
 #include <stdlib.h>
-#include <qdeclarativeextensionplugin.h>
-#include <qdeclarativecontext.h>
-#include <qdeclarativeengine.h>
-#include <qdeclarative.h>
-
 #include <QTime>
 #include <QTimer>
 
-class TileData : public QObject
-{
-    Q_OBJECT
-public:
-    TileData() : _hasFlag(false), _hasMine(false), _hint(-1), _flipped(false) {}
-
-    Q_PROPERTY(bool hasFlag READ hasFlag WRITE setHasFlag NOTIFY hasFlagChanged)
-    bool hasFlag() const { return _hasFlag; }
-
-    Q_PROPERTY(bool hasMine READ hasMine NOTIFY hasMineChanged)
-    bool hasMine() const { return _hasMine; }
-
-    Q_PROPERTY(int hint READ hint NOTIFY hintChanged)
-    int hint() const { return _hint; }
-
-    Q_PROPERTY(bool flipped READ flipped NOTIFY flippedChanged())
-    bool flipped() const { return _flipped; }
-
-    void setHasFlag(bool flag) {if(flag==_hasFlag) return; _hasFlag = flag; emit hasFlagChanged();}
-    void setHasMine(bool mine) {if(mine==_hasMine) return; _hasMine = mine; emit hasMineChanged();}
-    void setHint(int hint) { if(hint == _hint) return; _hint = hint; emit hintChanged(); }
-    void flip() { if (_flipped) return; _flipped = true; emit flippedChanged(); }
-    void unflip() { if(!_flipped) return; _flipped = false; emit flippedChanged(); }
-
-signals:
-    void flippedChanged();
-    void hasFlagChanged();
-    void hintChanged();
-    void hasMineChanged();
-
-private:
-    bool _hasFlag;
-    bool _hasMine;
-    int _hint;
-    bool _flipped;
-};
-
-class MinehuntGame : public QObject
-{
-    Q_OBJECT
-public:
-    MinehuntGame();
-
-    Q_PROPERTY(QDeclarativeListProperty<TileData> tiles READ tiles CONSTANT)
-    QDeclarativeListProperty<TileData> tiles();
-
-    Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
-    bool isPlaying() {return playing;}
-
-    Q_PROPERTY(bool hasWon READ hasWon NOTIFY hasWonChanged)
-    bool hasWon() {return won;}
-
-    Q_PROPERTY(int numMines READ numMines NOTIFY numMinesChanged)
-    int numMines() const{return nMines;}
-
-    Q_PROPERTY(int numFlags READ numFlags NOTIFY numFlagsChanged)
-    int numFlags() const{return nFlags;}
-
-public slots:
-    Q_INVOKABLE bool flip(int row, int col);
-    Q_INVOKABLE bool flag(int row, int col);
-    void setBoard();
-    void reset();
-
-signals:
-    void isPlayingChanged();
-    void hasWonChanged();
-    void numMinesChanged();
-    void numFlagsChanged();
-
-private:
-    bool onBoard( int r, int c ) const { return r >= 0 && r < numRows && c >= 0 && c < numCols; }
-    TileData *tile( int row, int col ) { return onBoard(row, col) ? _tiles[col+numRows*row] : 0; }
-    int getHint(int row, int col);
-    void setPlaying(bool b){if(b==playing) return; playing=b; emit isPlayingChanged();}
-
-    QList<TileData *> _tiles;
-    int numCols;
-    int numRows;
-    bool playing;
-    bool won;
-    int remaining;
-    int nMines;
-    int nFlags;
-};
+#include "minehunt.h"
 
 void tilesPropAppend(QDeclarativeListProperty<TileData>* prop, TileData* value)
 {
@@ -306,29 +217,3 @@ bool MinehuntGame::flag(int row, int col)
     emit numFlagsChanged();
     return true;
 }
-
-class MinehuntExtensionPlugin : public QDeclarativeExtensionPlugin
-{
-    Q_OBJECT
-
-    public:
-    void registerTypes(const char *uri) {
-        Q_UNUSED(uri);
-        qmlRegisterType<TileData>();
-    }
-
-    void initializeEngine(QDeclarativeEngine *engine, const char *uri) {
-        Q_UNUSED(uri);
-
-        srand(QTime(0,0,0).secsTo(QTime::currentTime()));
-
-        MinehuntGame* game = new MinehuntGame();
-
-        engine->rootContext()->setContextObject(game);
-    }
-};
-
-#include "minehunt.moc"
-
-Q_EXPORT_PLUGIN(MinehuntExtensionPlugin);
-
diff --git a/demos/declarative/minehunt/minehunt.h b/demos/declarative/minehunt/minehunt.h
new file mode 100644
index 0000000..962cf3d
--- /dev/null
+++ b/demos/declarative/minehunt/minehunt.h
@@ -0,0 +1,129 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <qdeclarative.h>
+
+class TileData : public QObject
+{
+    Q_OBJECT
+public:
+    TileData() : _hasFlag(false), _hasMine(false), _hint(-1), _flipped(false) {}
+
+    Q_PROPERTY(bool hasFlag READ hasFlag WRITE setHasFlag NOTIFY hasFlagChanged)
+    bool hasFlag() const { return _hasFlag; }
+
+    Q_PROPERTY(bool hasMine READ hasMine NOTIFY hasMineChanged)
+    bool hasMine() const { return _hasMine; }
+
+    Q_PROPERTY(int hint READ hint NOTIFY hintChanged)
+    int hint() const { return _hint; }
+
+    Q_PROPERTY(bool flipped READ flipped NOTIFY flippedChanged())
+    bool flipped() const { return _flipped; }
+
+    void setHasFlag(bool flag) {if(flag==_hasFlag) return; _hasFlag = flag; emit hasFlagChanged();}
+    void setHasMine(bool mine) {if(mine==_hasMine) return; _hasMine = mine; emit hasMineChanged();}
+    void setHint(int hint) { if(hint == _hint) return; _hint = hint; emit hintChanged(); }
+    void flip() { if (_flipped) return; _flipped = true; emit flippedChanged(); }
+    void unflip() { if(!_flipped) return; _flipped = false; emit flippedChanged(); }
+
+signals:
+    void flippedChanged();
+    void hasFlagChanged();
+    void hintChanged();
+    void hasMineChanged();
+
+private:
+    bool _hasFlag;
+    bool _hasMine;
+    int _hint;
+    bool _flipped;
+};
+
+class MinehuntGame : public QObject
+{
+    Q_OBJECT
+public:
+    MinehuntGame();
+
+    Q_PROPERTY(QDeclarativeListProperty<TileData> tiles READ tiles CONSTANT)
+    QDeclarativeListProperty<TileData> tiles();
+
+    Q_PROPERTY(bool isPlaying READ isPlaying NOTIFY isPlayingChanged)
+    bool isPlaying() {return playing;}
+
+    Q_PROPERTY(bool hasWon READ hasWon NOTIFY hasWonChanged)
+    bool hasWon() {return won;}
+
+    Q_PROPERTY(int numMines READ numMines NOTIFY numMinesChanged)
+    int numMines() const{return nMines;}
+
+    Q_PROPERTY(int numFlags READ numFlags NOTIFY numFlagsChanged)
+    int numFlags() const{return nFlags;}
+
+public slots:
+    Q_INVOKABLE bool flip(int row, int col);
+    Q_INVOKABLE bool flag(int row, int col);
+    void setBoard();
+    void reset();
+
+signals:
+    void isPlayingChanged();
+    void hasWonChanged();
+    void numMinesChanged();
+    void numFlagsChanged();
+
+private:
+    bool onBoard( int r, int c ) const { return r >= 0 && r < numRows && c >= 0 && c < numCols; }
+    TileData *tile( int row, int col ) { return onBoard(row, col) ? _tiles[col+numRows*row] : 0; }
+    int getHint(int row, int col);
+    void setPlaying(bool b){if(b==playing) return; playing=b; emit isPlayingChanged();}
+
+    QList<TileData *> _tiles;
+    int numCols;
+    int numRows;
+    bool playing;
+    bool won;
+    int remaining;
+    int nMines;
+    int nFlags;
+};
diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro
index f85afeb..1d56013 100644
--- a/demos/declarative/minehunt/minehunt.pro
+++ b/demos/declarative/minehunt/minehunt.pro
@@ -1,38 +1,22 @@
-TEMPLATE = lib
-TARGET  = qmlminehuntplugin
+TEMPLATE = app
+TARGET  = minehunt
 QT += declarative
 CONFIG += qt plugin
 
-TARGET = $$qtLibraryTarget($$TARGET)
-DESTDIR = MinehuntCore
-
 # Input
-SOURCES += minehunt.cpp
+HEADERS += minehunt.h
+SOURCES += main.cpp minehunt.cpp
 
-sources.files = minehunt.qml minehunt.pro
+sources.files = minehunt.qml minehunt.pro MinehuntCore
 sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt
+target.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt
 
-target.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCore
-
-MinehuntCore_sources.files = \
-    MinehuntCore/Explosion.qml \
-    MinehuntCore/Tile.qml \
-    MinehuntCore/pics \
-    MinehuntCore/qmldir
-MinehuntCore_sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt/MinehuntCore
-
-INSTALLS = sources MinehuntCore_sources target
+INSTALLS = sources target
 
 symbian:{
     TARGET.EPOCALLOWDLLDATA = 1
     include($$QT_SOURCE_TREE/demos/symbianpkgrules.pri)
-    TARGET.CAPABILITY = NetworkServices ReadUserData
-    importFiles.sources = MinehuntCore/qmlminehuntplugin.dll \
-    MinehuntCore/Explosion.qml \
-    MinehuntCore/pics \
-    MinehuntCore/qmldir
-    importFiles.path = MinehuntCore
-    DEPLOYMENT = importFiles
+    qmlminehuntfiles.sources = MinehuntCore minehunt.qml
+    DEPLOYMENT = qmlminehuntfiles
 }
- 
-INSTALLS = sources MinehuntCore_sources target
+ 
\ No newline at end of file
diff --git a/demos/qtdemo/mainwindow.h b/demos/qtdemo/mainwindow.h
index e613268..b8cfda6 100644
--- a/demos/qtdemo/mainwindow.h
+++ b/demos/qtdemo/mainwindow.h
@@ -43,7 +43,6 @@
 #define MAIN_WINDOW_H
 
 #include <QtGui>
-#include <QtDeclarative>
 #include <QPixmap>
 
 class DemoTextItem;
diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp
index 5b851b4..4ae9ca1 100644
--- a/demos/qtdemo/menumanager.cpp
+++ b/demos/qtdemo/menumanager.cpp
@@ -356,6 +356,7 @@ void MenuManager::launchExample(const QString &name)
 
 void MenuManager::launchQmlExample(const QString &name)
 {
+#ifndef QT_NO_DECLARATIVE
     if(!qmlRoot){
         exampleError(QProcess::UnknownError);
         return;
@@ -382,6 +383,17 @@ void MenuManager::launchQmlExample(const QString &name)
     qmlRoot->setProperty("qmlFile", QVariant(""));//unload component
     qmlRoot->setProperty("show", QVariant(true));
     qmlRoot->setProperty("qmlFile", QUrl::fromLocalFile(file.fileName()));
+#else
+    QMessageBox::critical(0, tr("Failed to launch the example"),
+            tr("This application was built without the QtDeclarative module, and therefore declarative examples have been disabled."),
+            QMessageBox::Cancel);
+#endif
+}
+
+void MenuManager::quitQML()
+{
+    if(qmlRoot)
+        qmlRoot->setProperty("show", QVariant(false));
 }
 
 void MenuManager::exampleFinished()
@@ -427,21 +439,28 @@ void MenuManager::init(MainWindow *window)
         level2MenuNode = level2MenuNode.nextSibling();
     }
 
+    qmlRoot = 0;
+#ifndef QT_NO_DECLARATIVE
     // Create QML Loader
     declarativeEngine = new QDeclarativeEngine(this);
+    connect(declarativeEngine, SIGNAL(quit()),
+            this, SLOT(quitQML()));
 
     QDeclarativeComponent component(declarativeEngine, QUrl("qrc:qml/qmlShell.qml"), this);
-    qmlRoot = 0;
-    if(component.isReady())
-        qmlRoot = qobject_cast<QDeclarativeItem*>(component.create());
-    else
+    QDeclarativeItem* qmlRootItem = 0;
+    if(component.isReady()){
+        qmlRoot = component.create();
+        qmlRootItem = qobject_cast<QDeclarativeItem*>(qmlRoot);
+    }else{
         qDebug() << component.status() << component.errorString();
-    if(qmlRoot){
-        qmlRoot->setHeight(this->window->scene->sceneRect().height());
-        qmlRoot->setWidth(this->window->scene->sceneRect().width());
-        qmlRoot->setZValue(101);//Above other items
-        qmlRoot->setCursor(Qt::ArrowCursor);
-        window->scene->addItem(qmlRoot);
+    }
+
+    if(qmlRootItem){
+        qmlRootItem->setHeight(this->window->scene->sceneRect().height());
+        qmlRootItem->setWidth(this->window->scene->sceneRect().width());
+        qmlRootItem->setZValue(101);//Above other items
+        qmlRootItem->setCursor(Qt::ArrowCursor);
+        window->scene->addItem(qmlRootItem);
 
         //Note that QML adds key handling to the app.
         window->viewport()->setFocusPolicy(Qt::NoFocus);//Correct keyboard focus handling
@@ -451,6 +470,7 @@ void MenuManager::init(MainWindow *window)
     }else{
         qDebug() << "Error initializing QML subsystem, Declarative examples will not work";
     }
+#endif
 }
 
 void MenuManager::readInfoAboutExample(const QDomElement &example)
diff --git a/demos/qtdemo/menumanager.h b/demos/qtdemo/menumanager.h
index 5e14204..93fb998 100644
--- a/demos/qtdemo/menumanager.h
+++ b/demos/qtdemo/menumanager.h
@@ -45,6 +45,9 @@
 #include <QtGui>
 #include <QtXml>
 #include <QtHelp/QHelpEngineCore>
+#ifndef QT_NO_DECLARATIVE
+#include <QtDeclarative>
+#endif
 
 #include "score.h"
 #include "textbutton.h"
@@ -83,13 +86,17 @@ public:
     Score *score;
     int currentMenuCode;
 
+    QObject *qmlRoot;
+#ifndef QT_NO_DECLARATIVE
     QDeclarativeEngine* declarativeEngine;
-    QDeclarativeItem *qmlRoot;
+#endif
 
 private slots:
     void exampleFinished();
     void exampleError(QProcess::ProcessError error);
 
+    void quitQML();
+
 private:
     // singleton pattern:
     MenuManager();
diff --git a/demos/qtdemo/qmlShell.qml b/demos/qtdemo/qmlShell.qml
index b5fdf39..24c12ae 100644
--- a/demos/qtdemo/qmlShell.qml
+++ b/demos/qtdemo/qmlShell.qml
@@ -68,8 +68,6 @@ Item {
                     loader.item.width = 640;
                 if(loader.item.height > 480)
                     loader.item.height = 480;
-                if(loader.item.inAnotherDemo != undefined)
-                    loader.item.inAnotherDemo = true;
             }}
 
         }
@@ -100,6 +98,30 @@ Item {
             }
 
         }
+        Rectangle{ id: closeButton
+            width: 24
+            height: 24
+            z: 11
+            border.color: "#aaaaaaaa"
+            gradient: Gradient{
+                GradientStop{ position: 0.0; color: "#34FFFFFF" }
+                GradientStop{ position: 1.0; color: "#7AFFFFFF" }
+            }
+            anchors.left: frame.right
+            anchors.bottom: frame.top
+            anchors.margins: -(2*width/3)
+            Text{
+                text: 'X'
+                font.bold: true
+                color: "white"
+                font.pixelSize: 12
+                anchors.centerIn: parent
+            }
+            MouseArea{
+                anchors.fill: parent
+                onClicked: main.show = false;
+            }
+        }
 
         Text{
             id: errorTxt
@@ -116,32 +138,6 @@ Item {
             onLinkActivated: Qt.openUrlExternally(link);
         }
     }
-    Rectangle{
-        id: helpLabel
-        property bool timedOut: false
-        z: 9
-        //Positioned in the top left corner
-        x: 8 
-        y: 8
-        color: "white"
-        border.color: "black"
-        border.width: 1
-        width: helpText.width + 16
-        height: helpText.height + 8
-        Text{
-            id: helpText
-            color: "black"
-            anchors.centerIn: parent
-            text: "Click outside the example to exit it."
-        }
-        opacity: 0
-        Behavior on opacity{ NumberAnimation{duration:500} }
-        Timer{
-            id: helpTimer
-            interval: 5000
-            onTriggered: {helpLabel.timedOut=true}
-        }
-    }
     Rectangle{ id: blackout //Maybe use a colorize effect instead?
         z: 8
         anchors.fill: parent
@@ -154,7 +150,6 @@ Item {
         hoverEnabled: main.show //To steal focus from the buttons
         acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton
         anchors.fill: parent
-        onClicked: main.show=false;
     }
 
     states: [
@@ -166,10 +161,6 @@ Item {
                 opacity: 1
             }
             PropertyChanges {
-                target: helpLabel
-                opacity: helpLabel.timedOut?0:1
-            }
-            PropertyChanges {
                 target: blackout
                 opacity: 0.5
             }
@@ -178,8 +169,7 @@ Item {
     transitions: [//Should not be too long, because the component has already started running
         Transition { from: ''; to: "show"; reversible: true
             ParallelAnimation{
-                ScriptAction{ script: {helpLabel.timedOut = false; helpTimer.restart();} }
-                NumberAnimation{ exclude: helpLabel; properties: "opacity"; easing.type: Easing.InQuad; duration: 500}
+                NumberAnimation{ properties: "opacity"; easing.type: Easing.InQuad; duration: 500}
                 PropertyAction { target: loader; property: "focus"; value: true}//Might be needed to ensure the focus stays with us
             }
         }
diff --git a/demos/qtdemo/qtdemo.pro b/demos/qtdemo/qtdemo.pro
index 61ea376..836178b 100644
--- a/demos/qtdemo/qtdemo.pro
+++ b/demos/qtdemo/qtdemo.pro
@@ -6,13 +6,17 @@ DESTDIR = $$DEMO_DESTDIR/bin
 INSTALLS += target sources
 
 
-QT += xml network declarative
+QT += xml network
 
 contains(QT_CONFIG, opengl) {
     DEFINES += QT_OPENGL_SUPPORT
     QT += opengl
 }
 
+contains(QT_CONFIG, declarative) {
+    QT += declarative
+}
+
 build_all:!build_pass {
     CONFIG -= build_all
     CONFIG += release
diff --git a/doc/src/examples/qml-minehunt.qdoc b/doc/src/examples/qml-minehunt.qdoc
index be82302..e1ff22f 100644
--- a/doc/src/examples/qml-minehunt.qdoc
+++ b/doc/src/examples/qml-minehunt.qdoc
@@ -30,7 +30,7 @@
     \example demos/declarative/minehunt
 
     This demo shows how to create a simple Minehunt game, using QML for the
-    UI and a C++ plugin for the game logic.
+    UI and C++ for the game logic.
 
     \image qml-minehunt-demo.png
 */
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index bc7468f..cedf9d5 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -551,7 +551,7 @@ QDeclarativeEngine::~QDeclarativeEngine()
 }
 
 /*! \fn void QDeclarativeEngine::quit()
-    This signal is emitted when the QDeclarativeEngine quits.
+    This signal is emitted when the QML loaded by the engine would like to quit.
  */
 
 /*! \fn void QDeclarativeEngine::warnings(const QList<QDeclarativeError> &warnings)