diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-16 12:16:23 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-16 12:16:23 (GMT) |
| commit | 714a62490fd30986dc86559e6f14194a34b3a5bc (patch) | |
| tree | c5c189fb22eb2f20a6cf70c176f02dd348c83610 /src/gui/kernel/qapplication.cpp | |
| parent | aa1120804708c44ac72e20e228d5ef383a1cd62a (diff) | |
| parent | c41591d57377cd7c520efc93d9c087ad34d2bb6f (diff) | |
| download | Qt-714a62490fd30986dc86559e6f14194a34b3a5bc.zip Qt-714a62490fd30986dc86559e6f14194a34b3a5bc.tar.gz Qt-714a62490fd30986dc86559e6f14194a34b3a5bc.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/qnamespace.qdoc
doc/src/snippets/code/src_gui_qproxystyle.cpp
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebKit/qt/ChangeLog
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication_x11.cpp
src/gui/kernel/qt_x11_p.h
src/gui/kernel/qwidget.cpp
src/gui/styles/qproxystyle.cpp
src/gui/styles/qstyle.cpp
src/scripttools/debugging/qscriptdebugger.cpp
src/scripttools/debugging/qscriptenginedebugger.cpp
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/kernel/qsqldatabase.cpp
src/sql/kernel/qsqldriver.cpp
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 5269841..509f5fd 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -1400,7 +1400,7 @@ void QApplication::setStyle(QStyle *style) #endif // QT_NO_STYLE_STYLESHEET QApplicationPrivate::app_style = style; QApplicationPrivate::app_style->setParent(qApp); // take ownership - + // take care of possible palette requirements of certain gui // styles. Do it before polishing the application since the style // might call QApplication::setPalette() itself |