diff options
| author | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-19 10:48:45 (GMT) |
| commit | 1c48ec8f4876db0b4c7b86dd19ab8bb27c082786 (patch) | |
| tree | 8ca2723a27ae670b3e84dfb21b6a3a28d3bbe401 /tools/designer/src | |
| parent | 0374c15075f98b0b4efbb1c00ef3812b67fabe0f (diff) | |
| parent | ade4d096fc2ea145a3d9586e3ab2a9af9c5a9a72 (diff) | |
| download | Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.zip Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.gz Qt-1c48ec8f4876db0b4c7b86dd19ab8bb27c082786.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into merge-with-qt-master
Conflicts:
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'tools/designer/src')
| -rw-r--r-- | tools/designer/src/components/formeditor/formwindow.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp index 631ca7c..15775f6 100644 --- a/tools/designer/src/components/formeditor/formwindow.cpp +++ b/tools/designer/src/components/formeditor/formwindow.cpp @@ -1436,6 +1436,14 @@ struct ArrowKeyOperation { int arrowKey; }; +} // namespace + +QT_END_NAMESPACE +Q_DECLARE_METATYPE(qdesigner_internal::ArrowKeyOperation) +QT_BEGIN_NAMESPACE + +namespace qdesigner_internal { + QRect ArrowKeyOperation::apply(const QRect &rect) const { QRect r = rect; @@ -2964,4 +2972,3 @@ QUndoStack *FormWindow::commandHistory() const QT_END_NAMESPACE -Q_DECLARE_METATYPE(qdesigner_internal::ArrowKeyOperation) |