diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2009-07-17 00:26:25 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2009-07-17 00:26:25 (GMT) |
| commit | 4200dec4f01d8181a39704c149bc49c9a8882274 (patch) | |
| tree | 6a17d899567c5569ad47673bd734c9221f1e9fc9 /src/gui/kernel/qapplication.cpp | |
| parent | 46fa97f020a310de3ad6f92860dffdb402955b14 (diff) | |
| parent | b1690ae329a3b81628d3ac6c19b24960177b6e73 (diff) | |
| download | Qt-4200dec4f01d8181a39704c149bc49c9a8882274.zip Qt-4200dec4f01d8181a39704c149bc49c9a8882274.tar.gz Qt-4200dec4f01d8181a39704c149bc49c9a8882274.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
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 a7cc5af..b168188 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -126,7 +126,7 @@ int QApplicationPrivate::app_compile_version = 0x040000; //we don't know exactly QApplication::Type qt_appType=QApplication::Tty; QApplicationPrivate *QApplicationPrivate::self = 0; -QInputContext *QApplicationPrivate::inputContext; +QInputContext *QApplicationPrivate::inputContext = 0; bool QApplicationPrivate::quitOnLastWindowClosed = true; |