diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 16:12:25 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-20 16:12:25 (GMT) |
| commit | 372af5d18bb85c41ce336f2bbf72b44646d8a79f (patch) | |
| tree | 06c487f426fee92cf01eb8c1601ce44f99ee79ba /demos/spectrum/app/settingsdialog.h | |
| parent | dfc61f6b59886f7d223722bf149342cdd46581a8 (diff) | |
| parent | 83245ed872b6265d872a8ab0235c9dbd1f2daf4b (diff) | |
| download | Qt-372af5d18bb85c41ce336f2bbf72b44646d8a79f.zip Qt-372af5d18bb85c41ce336f2bbf72b44646d8a79f.tar.gz Qt-372af5d18bb85c41ce336f2bbf72b44646d8a79f.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:
Removed a change from the 4.7.0 change log.
Improve look and feel of itemviews on mac
doc: Fixed many broken links.
doc: Fixed many broken links.
update 4.7.0 changes
QPushButton's click area exceeds the button area by far on Mac OS X
QApplication::closeAllWindows() should ignore windows being closed
Examples: Fix compilation with namespace.
Use QApplication::arguments() to check for command line args
Added support for .rc files on VS2010.
Doc: Updating CSS and JS
Docs: added an intro for qml, Quick for Beginners.
Fix crash on exit in native wifi plugin on Vista+ when run in debugger.
Diffstat (limited to 'demos/spectrum/app/settingsdialog.h')
| -rw-r--r-- | demos/spectrum/app/settingsdialog.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/spectrum/app/settingsdialog.h b/demos/spectrum/app/settingsdialog.h index 7215a50..fda518b 100644 --- a/demos/spectrum/app/settingsdialog.h +++ b/demos/spectrum/app/settingsdialog.h @@ -42,11 +42,13 @@ #include <QDialog> #include <QtMultimedia/QAudioDeviceInfo> +QT_BEGIN_NAMESPACE class QComboBox; class QCheckBox; class QSlider; class QSpinBox; class QGridLayout; +QT_END_NAMESPACE /** * Dialog used to control settings such as the audio input / output device |