diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-14 05:46:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-14 05:46:26 (GMT) |
| commit | 36c538d034d5c7df1cbc8c92110c8d28638f699e (patch) | |
| tree | 443a9cccf69c886bfc1cbcb39d0e8db1bf360696 /demos | |
| parent | ee60791655c3303e50cef4fc0ebd1ad644467fc8 (diff) | |
| parent | 05477289bb7f99e617d8b39c64fbbff2b30be368 (diff) | |
| download | Qt-36c538d034d5c7df1cbc8c92110c8d28638f699e.zip Qt-36c538d034d5c7df1cbc8c92110c8d28638f699e.tar.gz Qt-36c538d034d5c7df1cbc8c92110c8d28638f699e.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: (55 commits)
Fix symbian-abld build failure with bearer plugins
remove certificate bundle
make QSslSocket::systemCaCertificates() use system certs
Adjusted RegExp in QSslCertificate::fromPath()
Fix QSystemTrayIcon::supportsMessages() on Windows
Use NIM_SETVERSION to get the latest behavior
Cleanup obsolete stuff
doc: Added DITA XML generator
Fixed a broken merge.
Changed the way we detect touch screen on Windows.
Fixed error deploying qsymbianbearer.qtplugin on Symbian.
Revert "Attempt to fix build failure on Symbian."
Attempt to fix build failure on Symbian.
Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, B) {...}" constructions with "else"
Updated leading whitespace to make indentation more consistent
Updated project files so it is now possible to use "-system-zlib" configuration option on Windows and Symbian platforms.
make postgresql support sensitive to PSQL_LIBS
support for cross building Qt for MinGW (win32-g++) on Unix
use "win32-g++*" scope to match all MinGW makespecs
Demos: Fix compilation with namespace.
...
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/spectrum/app/mainwidget.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/demos/spectrum/app/mainwidget.h b/demos/spectrum/app/mainwidget.h index b3dc352..ddab8b7 100644 --- a/demos/spectrum/app/mainwidget.h +++ b/demos/spectrum/app/mainwidget.h @@ -59,7 +59,6 @@ QT_FORWARD_DECLARE_CLASS(QLabel) QT_FORWARD_DECLARE_CLASS(QPushButton) QT_FORWARD_DECLARE_CLASS(QMenu) QT_FORWARD_DECLARE_CLASS(QAction) -QT_END_NAMESPACE /** * Main application widget, responsible for connecting the various UI |