diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 03:48:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-09-28 03:48:37 (GMT) |
| commit | e9d3fa89b4e34090eb9691412ad1caf6f323a006 (patch) | |
| tree | 63082d09d321e929415a5410c10a1326fc5c2595 /src/gui/kernel/qapplication.cpp | |
| parent | 7b796b4dcdebfba55c4754d241edb334217fc550 (diff) | |
| parent | e15561e88b6105f324e816add50bcde9a9a107d8 (diff) | |
| download | Qt-e9d3fa89b4e34090eb9691412ad1caf6f323a006.zip Qt-e9d3fa89b4e34090eb9691412ad1caf6f323a006.tar.gz Qt-e9d3fa89b4e34090eb9691412ad1caf6f323a006.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:
Fix compile warnings (unused variables).
Removing libconninet 3rdparty component.
Closes properly the dbus connection in icd backend
Connect/Disconnect requests needs to use the same dbus connection to ICD for the refcounting to work in ICD.
Added my changes to the changelog.
Clarified documentation of loadFinished() signal.
Added a condition to skip obsolete functions during the threadness check.
Doc: call qApp->precessEvents after QSplashScreen::showMessage
Doc: Said that QApplication exits when not able to open X11 display
Doc: maintainance - fixing grammar and spelling
Doc: Added a note to qmake INSTALLS docs
Doc: Fixing overlapping text problem in columns
Doc: Added info on QWidget::render to printing docs
Added default value documentation for two variables.
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 185af9a..fdacefc 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -711,6 +711,12 @@ void QApplicationPrivate::process_cmdline() done. \endlist + \section1 X11 Notes + + If QApplication fails to open the X11 display, it will terminate + the process. This behavior is consistent with most X11 + applications. + \sa arguments() */ |