diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-29 20:49:23 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-29 20:49:24 +0100 |
| commit | 27e8612fa415522b52e03de7430fbe2e8fff02e4 (patch) | |
| tree | 5b7ede058e8183ba901c504cc8abfad767474abb /examples | |
| parent | 11f6c646967c61e3eac6302a2d4ea8f30a41beff (diff) | |
| parent | 3adfcbf1ed9b63c3ce41d7417658db3836fd3530 (diff) | |
| download | qtbase-27e8612fa415522b52e03de7430fbe2e8fff02e4.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I6b40ecee4db13e6329e7a0433b57c5bca473c63f
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/corelib/ipc/ipc.pro | 6 | ||||
| -rw-r--r-- | examples/opengl/hellogles3/main.cpp | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/examples/corelib/ipc/ipc.pro b/examples/corelib/ipc/ipc.pro index 101552cea9..68c88d75aa 100644 --- a/examples/corelib/ipc/ipc.pro +++ b/examples/corelib/ipc/ipc.pro @@ -3,4 +3,8 @@ requires(qtHaveModule(widgets)) TEMPLATE = subdirs qtConfig(sharedmemory): SUBDIRS = sharedmemory -qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient +qtHaveModule(network) { + QT_FOR_CONFIG += network + + qtConfig(localserver): SUBDIRS += localfortuneserver localfortuneclient +} diff --git a/examples/opengl/hellogles3/main.cpp b/examples/opengl/hellogles3/main.cpp index a6c6398628..29b3b9617a 100644 --- a/examples/opengl/hellogles3/main.cpp +++ b/examples/opengl/hellogles3/main.cpp @@ -64,6 +64,8 @@ int main(int argc, char *argv[]) { + QGuiApplication app(argc, argv); + QSurfaceFormat fmt; fmt.setDepthBufferSize(24); @@ -79,8 +81,6 @@ int main(int argc, char *argv[]) QSurfaceFormat::setDefaultFormat(fmt); - QGuiApplication app(argc, argv); - GLWindow glWindow; glWindow.showMaximized(); |