diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-21 12:32:52 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-10-21 12:32:52 (GMT) |
| commit | 5c319b2ec940e34d2d5102c804b84c66e8ae66f1 (patch) | |
| tree | ce1a995ad45d89575bc9a6ac3cdadb083b5ad95a /src/gui/styles/qs60style.h | |
| parent | 4279889ebebb9fdd026fc107f60f825fb2ad565e (diff) | |
| parent | 522fc01a18b9eae80b733befb98a948f0fbbba06 (diff) | |
| download | Qt-5c319b2ec940e34d2d5102c804b84c66e8ae66f1.zip Qt-5c319b2ec940e34d2d5102c804b84c66e8ae66f1.tar.gz Qt-5c319b2ec940e34d2d5102c804b84c66e8ae66f1.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6-WM_NULL-driven
Diffstat (limited to 'src/gui/styles/qs60style.h')
| -rw-r--r-- | src/gui/styles/qs60style.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h index 6be3197..ab10792 100644 --- a/src/gui/styles/qs60style.h +++ b/src/gui/styles/qs60style.h @@ -101,7 +101,7 @@ protected Q_SLOTS: private: Q_DISABLE_COPY(QS60Style) friend class QStyleFactory; - friend class QApplication; + friend class QApplicationPrivate; }; #endif // QT_NO_STYLE_S60 |