diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-16 08:50:06 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-16 08:50:06 (GMT) |
| commit | 048e0ba0be9c6aec608706e15eda040f7219c420 (patch) | |
| tree | b8dfa3ef1c6be0a62e7783ce988a30b0633be68a /tools/qml/qmlruntime.h | |
| parent | 8c942f6d2998ffcd024437e408f92d38750dd025 (diff) | |
| parent | 13ca61fcfdc53a6a06ae6f409ae0d9e17919336c (diff) | |
| download | Qt-048e0ba0be9c6aec608706e15eda040f7219c420.zip Qt-048e0ba0be9c6aec608706e15eda040f7219c420.tar.gz Qt-048e0ba0be9c6aec608706e15eda040f7219c420.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/qml/qmlruntime.h')
| -rw-r--r-- | tools/qml/qmlruntime.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h index 1ae771a..2089dda 100644 --- a/tools/qml/qmlruntime.h +++ b/tools/qml/qmlruntime.h @@ -105,11 +105,11 @@ public: QMenuBar *menuBar() const; + QDeclarativeView *view() const; + public slots: void sceneResized(QSize size); - void open(const QString&); - void openWgt(const QString&); - void openQml(const QString&); + bool open(const QString&); void openFile(); void reload(); void takeSnapShot(); @@ -142,7 +142,6 @@ private slots: void toggleOrientation(); void startNetwork(); void toggleFullScreen(); - void unpackWgt(); private: QString getVideoFileName(); |