summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qapplication.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-23 08:46:26 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-23 08:46:26 (GMT)
commitbe3916b7e4e8007394cbed40484ef6b696e90f2b (patch)
treea66dc85f3900e08a040f0d80eb0e56f43a163efc /src/gui/kernel/qapplication.cpp
parented24cd82444faeeda0a171a9082808ebb667e092 (diff)
parent389c4fdebe681eb3af5a2431c390323f52a03c17 (diff)
downloadQt-be3916b7e4e8007394cbed40484ef6b696e90f2b.zip
Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.gz
Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
-rw-r--r--src/gui/kernel/qapplication.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index d5a96bd..9ce5f80 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -832,12 +832,13 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv,
#endif // Q_WS_X11
+extern void qInitDrawhelperAsm();
/*!
+ \fn void QApplicationPrivate::initialize()
+
Initializes the QApplication object, called from the constructors.
*/
-extern void qInitDrawhelperAsm();
-
void QApplicationPrivate::initialize()
{
QWidgetPrivate::mapper = new QWidgetMapper;
@@ -2100,8 +2101,8 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason)
if (that)
QApplication::sendEvent(that->style(), &in);
}
+ emit qApp->focusChanged(prev, focus_widget);
}
- emit qApp->focusChanged(prev, focus_widget);
}
}