diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-23 16:48:35 (GMT) |
|---|---|---|
| committer | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2010-02-23 16:48:35 (GMT) |
| commit | bbc2099ea172ea65294bd91554145786c2a4a9e1 (patch) | |
| tree | aa9c739c87775ff76b37ca839d987dc43a110b80 /src/gui/text | |
| parent | 6566f5e341c18912f7f1a9fbf4727e0ac92a1a9f (diff) | |
| parent | 05402ac27bd669c371e4ba08763ba45d6b31edc4 (diff) | |
| download | Qt-bbc2099ea172ea65294bd91554145786c2a4a9e1.zip Qt-bbc2099ea172ea65294bd91554145786c2a4a9e1.tar.gz Qt-bbc2099ea172ea65294bd91554145786c2a4a9e1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qstatictext.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h index 1e59944..00d42e0 100644 --- a/src/gui/text/qstatictext.h +++ b/src/gui/text/qstatictext.h @@ -97,10 +97,10 @@ private: friend class QStaticTextPrivate; }; -Q_DECLARE_METATYPE(QStaticText) - QT_END_NAMESPACE +Q_DECLARE_METATYPE(QStaticText) + QT_END_HEADER #endif // QSTATICTEXT_H |