diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 22:13:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 22:13:11 (GMT) |
| commit | 7b78eab2c04ed0388a2ffdf43bbe5ca37ccc8167 (patch) | |
| tree | ef228ff6e4e4e60241313c907827c28395ac127b /demos/declarative/minehunt | |
| parent | a197afa76c4b33a0e1d0428895b609bbfd030703 (diff) | |
| parent | a32650dc78c925a9b4aed179c80f6e27a67d436b (diff) | |
| download | Qt-7b78eab2c04ed0388a2ffdf43bbe5ca37ccc8167.zip Qt-7b78eab2c04ed0388a2ffdf43bbe5ca37ccc8167.tar.gz Qt-7b78eab2c04ed0388a2ffdf43bbe5ca37ccc8167.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Fix the icd auto config test after restructuring the icd plugin dependencies
Ensure that actions are still fired even if there is no visible window
Support device orientation in harmattan
Connect property alias change signals on use
Doc fix.
Fix setting PathView offset when all visible items are removed.
Rename toolbar button.
Update import statement.
Fixes assert in QDeclarativeWebView
Do not show 'More' button when in fullscreen view.
Set reasonable QT_GUI_DRAG_DISTANCE in mkspecs/linux-g++-maemo/qplatformdefs.h
Allow default QApplication::startDragDistance() to be defined in platformdefs.h
Autotest
Ensure the TextInput cursor blinks immediately when enabled.
Fix minehunt execution from QtDemo
Update QtGui def files
Ensure PathView updates positions when path changes.
Create Loader components in correct context
Diffstat (limited to 'demos/declarative/minehunt')
| -rw-r--r-- | demos/declarative/minehunt/main.cpp | 2 | ||||
| -rw-r--r-- | demos/declarative/minehunt/minehunt.pro | 1 | ||||
| -rw-r--r-- | demos/declarative/minehunt/minehunt.qrc | 20 |
3 files changed, 22 insertions, 1 deletions
diff --git a/demos/declarative/minehunt/main.cpp b/demos/declarative/minehunt/main.cpp index 8bbaee9..2b286ef 100644 --- a/demos/declarative/minehunt/main.cpp +++ b/demos/declarative/minehunt/main.cpp @@ -58,7 +58,7 @@ int main(int argc, char *argv[]) canvas.setResizeMode(QDeclarativeView::SizeRootObjectToView); #endif canvas.engine()->rootContext()->setContextObject(game); - canvas.setSource(QString("minehunt.qml")); + canvas.setSource(QString("qrc:minehunt.qml")); QObject::connect(canvas.engine(), SIGNAL(quit()), &app, SLOT(quit())); #ifdef Q_OS_SYMBIAN diff --git a/demos/declarative/minehunt/minehunt.pro b/demos/declarative/minehunt/minehunt.pro index 7a491ab..753ca4e 100644 --- a/demos/declarative/minehunt/minehunt.pro +++ b/demos/declarative/minehunt/minehunt.pro @@ -6,6 +6,7 @@ CONFIG += qt plugin # Input HEADERS += minehunt.h SOURCES += main.cpp minehunt.cpp +RESOURCES = minehunt.qrc sources.files = minehunt.qml minehunt.pro MinehuntCore sources.path = $$[QT_INSTALL_DEMOS]/declarative/minehunt diff --git a/demos/declarative/minehunt/minehunt.qrc b/demos/declarative/minehunt/minehunt.qrc new file mode 100644 index 0000000..fa8e27d --- /dev/null +++ b/demos/declarative/minehunt/minehunt.qrc @@ -0,0 +1,20 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource> + <file>minehunt.qml</file> + <file>MinehuntCore/Explosion.qml</file> + <file>MinehuntCore/Tile.qml</file> + <file>MinehuntCore/qmldir</file> + <file>MinehuntCore/pics/background.png</file> + <file>MinehuntCore/pics/back.png</file> + <file>MinehuntCore/pics/bomb-color.png</file> + <file>MinehuntCore/pics/bomb.png</file> + <file>MinehuntCore/pics/face-sad.png</file> + <file>MinehuntCore/pics/face-smile-big.png</file> + <file>MinehuntCore/pics/face-smile.png</file> + <file>MinehuntCore/pics/flag-color.png</file> + <file>MinehuntCore/pics/flag.png</file> + <file>MinehuntCore/pics/front.png</file> + <file>MinehuntCore/pics/quit.png</file> + <file>MinehuntCore/pics/star.png</file> +</qresource> +</RCC> |