diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 13:49:11 (GMT) |
| commit | 3fb36b36de90068db241cc21184a8ac3b899ad2d (patch) | |
| tree | 22490e313f1415681ddfb35f1b0ea0dca8f94ac6 /demos | |
| parent | d11e3d6e327677e828918de3173732116976fbe4 (diff) | |
| parent | f34f4ea2d35b92631e98a772e02a1b77ce26681e (diff) | |
| download | Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.zip Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.gz Qt-3fb36b36de90068db241cc21184a8ac3b899ad2d.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/mainwindow/mainwindow.cpp | 4 |
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))); |