diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2012-11-30 14:46:54 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 21:57:49 +0100 |
commit | a03d3fd4d35e3edb7998fdf8449554b75f87f25a (patch) | |
tree | 31ed062a5e54cebceddbfb596dc90bf202fe5763 /src/gui/doc | |
parent | 06678fd0b501c8b6e5ebc6d32a4e3b817bc58876 (diff) |
Docs: revise QApplication snippets
Change-Id: Ibbd31736154af6dd009d331578f9addc4de76e89
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'src/gui/doc')
-rw-r--r-- | src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp index ea7933fe53..1e2e7ba9f7 100644 --- a/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp +++ b/src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp @@ -39,29 +39,31 @@ ****************************************************************************/ //! [0] -int main(int argc, char **argv) +QCoreApplication* createApplication(int &argc, char *argv[]) { -#ifdef Q_WS_X11 - bool useGUI = getenv("DISPLAY") != 0; -#else - bool useGUI = true; -#endif - QApplication app(argc, argv, useGUI); - - if (useGUI) { - // start GUI version - ... + for (int i = 1; i < argc; ++i) + if (!qstrcmp(argv[i], "-no-gui")) + return new QCoreApplication(argc, argv); + return new QApplication(argc, argv); +} + +int main(int argc, char* argv[]) +{ + QScopedPointer<QCoreApplication> app(createApplication(argc, argv)); + + if (qobject_cast<QApplication *>(app.data())) { + // start GUI version... } else { - // start non-GUI version - ... + // start non-GUI version... } - return app.exec(); + + return app->exec(); } //! [0] //! [1] -QApplication::setStyle(new QWindowsStyle); +QApplication::setStyle(QStyleFactory::create("fusion")); //! [1] |