diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 23:07:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 23:07:53 (GMT) |
| commit | de300d7a41b0e428ba11e6061c39580c54012dc9 (patch) | |
| tree | 1c03abb47596da09841087e3b3cf7408b65bfb50 /tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp | |
| parent | abf09f87af8f57f670904ff25a626d19ec11120b (diff) | |
| parent | e884829f23fad15086f07aa92e1d92bcb71d53ba (diff) | |
| download | Qt-de300d7a41b0e428ba11e6061c39580c54012dc9.zip Qt-de300d7a41b0e428ba11e6061c39580c54012dc9.tar.gz Qt-de300d7a41b0e428ba11e6061c39580c54012dc9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix bug when resetting QSortFilterProxyModel
Fix the QSplitter not showing correctly in QGraphicsView
Remove ; after Q_PROPERTY declaration
Fix compilation issues of autotest on solaris
fix a crash when registering 2 metatype name for the same actual type
Fixed problem in painting of QTreeView
Diffstat (limited to 'tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp')
| -rw-r--r-- | tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp index 16a621a..fa3e0f9 100644 --- a/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp +++ b/tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp @@ -48,7 +48,7 @@ #include <QtGui/qwindowsstyle.h> class tst_QGraphicsAnchorLayout : public QObject { - Q_OBJECT; + Q_OBJECT public: tst_QGraphicsAnchorLayout() : QObject() { |