diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-17 16:58:50 +0100 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2011-06-16 10:04:23 +0300 |
| commit | d090deecf74e4bad670f9bf4ac9e013e69e27c80 (patch) | |
| tree | ad5b889959408875b145894a71132777ab0526b3 | |
| parent | c7feb83426a3c3e1ea8b428f4e6e0724e4c23b63 (diff) | |
| download | qt4-tools-d090deecf74e4bad670f9bf4ac9e013e69e27c80.tar.gz | |
Fix compilation with IBM xlC 7:
"../../../../../include/QtCore/../../src/corelib/kernel/qmetatype.h", line 202.49: 1540-0062 (S) The incomplete class "QMetaTypeId<qdesigner_internal::ArrowKeyOperation>" must not be used as a qualifier.
So move the Q_DECLARE_METATYPE before the use.
Reviewed-By: hjk <qtc-committer@nokia.com>
| -rw-r--r-- | tools/designer/src/components/formeditor/formwindow.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/designer/src/components/formeditor/formwindow.cpp b/tools/designer/src/components/formeditor/formwindow.cpp index 2ac4b815c3..84b61ae389 100644 --- a/tools/designer/src/components/formeditor/formwindow.cpp +++ b/tools/designer/src/components/formeditor/formwindow.cpp @@ -1439,6 +1439,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; @@ -1462,12 +1470,6 @@ QDebug operator<<(QDebug in, const ArrowKeyOperation &op) return in; } -} // namespace qdesigner_internal - -Q_DECLARE_METATYPE(qdesigner_internal::ArrowKeyOperation) - -namespace qdesigner_internal { - // ArrowKeyPropertyHelper: Applies a struct ArrowKeyOperation // (stored as new value) to a list of widgets using to calculate the // changed geometry of the widget in setValue(). Thus, the 'newValue' |