diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 02:50:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-06 02:50:24 (GMT) |
| commit | 91b1eff723c47fbe12d406a27053eea7d6c4a812 (patch) | |
| tree | 84f4e93a18db2f72ea089df9f8eccc549f9a4206 /examples/tutorials/modelview/7_selections/mainwindow.h | |
| parent | b9fb38de38f364a4c51d301c8e3d2dbdb90399e6 (diff) | |
| parent | 45cbfc6871da8582d13888b5808317cd3b7753c8 (diff) | |
| download | Qt-91b1eff723c47fbe12d406a27053eea7d6c4a812.zip Qt-91b1eff723c47fbe12d406a27053eea7d6c4a812.tar.gz Qt-91b1eff723c47fbe12d406a27053eea7d6c4a812.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Recognize @, #, $ and ` as word separators
rebuild configure.exe
Fix dependencies so JOM will handle parallellization properly
Symbian: Disable IPv6 for now
Doc: Fixed namespaced Qt build breakage in the model/view tutorial.
Doc: Fixing links on index page and corecting HTML in the template.
Accept empty authority segments in QUrl as different from not-present
Doc: Adds line about non-support for Webkit on Solaris
protect nil dictionary from release.
Fix potential KERN-EXEC 0 on Symbian.
Ukrainian translation updated
Fix remote crash in delivering D-Bus calls with too few arguments
Ensure that OpenGL contexts are attached to an NSView before first paint
Doc: Updating the 3rd party lib used in Qt - including JQuery
Doc: Changed the default URL to avoid a Flash plugin crash on x86-64.
Reduce memory consumption of QtScript/JSC on Symbian
Doc: Updated Supported Platforms page. Finished
New binary of configure.exe with -mp/-no-mp option
Turn Makefile.win32 into batch-mode, enable /MP and PCH
Add option to enable -MP compile option for MSVC
...
Diffstat (limited to 'examples/tutorials/modelview/7_selections/mainwindow.h')
| -rwxr-xr-x | examples/tutorials/modelview/7_selections/mainwindow.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h index f2defb5..a8f8488 100755 --- a/examples/tutorials/modelview/7_selections/mainwindow.h +++ b/examples/tutorials/modelview/7_selections/mainwindow.h @@ -42,10 +42,8 @@ #define MAINWINDOW_H #include <QtGui/QMainWindow> - -class QTreeView; //forward declaration -class QStandardItemModel; -class QItemSelection; +#include <QtGui/QTreeView> +#include <QtGui/QStandardItemModel> class MainWindow : public QMainWindow |