summaryrefslogtreecommitdiffstats
path: root/demos
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-06-18 15:35:03 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-06-18 15:35:03 (GMT)
commit106e7f2a19693d0a067131e45cb79abc6b8a2433 (patch)
tree86db74d4b0ceb5bbf9b6a3a10cbb693023561b18 /demos
parentfc0e74d5661da0a678a60082dae60d4564da94b0 (diff)
downloadQt-106e7f2a19693d0a067131e45cb79abc6b8a2433.zip
Qt-106e7f2a19693d0a067131e45cb79abc6b8a2433.tar.gz
Qt-106e7f2a19693d0a067131e45cb79abc6b8a2433.tar.bz2
Fix example compile and runtime warnings, webkit examples not built.
Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
Diffstat (limited to 'demos')
-rw-r--r--demos/mainwindow/mainwindow.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/demos/mainwindow/mainwindow.cpp b/demos/mainwindow/mainwindow.cpp
index 3ddb74b..350cefa 100644
--- a/demos/mainwindow/mainwindow.cpp
+++ b/demos/mainwindow/mainwindow.cpp
@@ -81,6 +81,8 @@ static const char * const message =
#endif
;
+Q_DECLARE_METATYPE(QDockWidget::DockWidgetFeatures)
+
MainWindow::MainWindow(const QMap<QString, QSize> &customSizeHints,
QWidget *parent, Qt::WindowFlags flags)
: QMainWindow(parent, flags)
@@ -274,6 +276,8 @@ QAction *addAction(QMenu *menu, const QString &text, QActionGroup *group, QSigna
void MainWindow::setupDockWidgets(const QMap<QString, QSize> &customSizeHints)
{
+ qRegisterMetaType<QDockWidget::DockWidgetFeatures>();
+
mapper = new QSignalMapper(this);
connect(mapper, SIGNAL(mapped(int)), this, SLOT(setCorner(int)));