diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 08:06:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-08-20 08:06:47 (GMT) |
| commit | e30a4498bf651bf7ddd4380a0641a6f52917a4cd (patch) | |
| tree | 28aec1711e58029ab9ca21de084c87a61232eb17 /demos/qtdemo/mainwindow.h | |
| parent | d129112034d600ea925a4199d8bad72388444335 (diff) | |
| parent | 80b6ed8e4894734b54aa1ffed977577b2d44969e (diff) | |
| download | Qt-e30a4498bf651bf7ddd4380a0641a6f52917a4cd.zip Qt-e30a4498bf651bf7ddd4380a0641a6f52917a4cd.tar.gz Qt-e30a4498bf651bf7ddd4380a0641a6f52917a4cd.tar.bz2 | |
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
Diffstat (limited to 'demos/qtdemo/mainwindow.h')
| -rw-r--r-- | demos/qtdemo/mainwindow.h | 1 |
1 files changed, 0 insertions, 1 deletions
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; |