diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-24 16:02:55 +0100 |
| commit | 627d9cbd3c45834fe7aa1f2ee37fdfca07a03976 (patch) | |
| tree | c0805165804b2a9ef809318dd6a84132d2e57744 /examples | |
| parent | fed2d237b71ac2f586dca0d35d104e7cf0cd9bd2 (diff) | |
| parent | 1b5f9bec03901519db3694d1b51fa7989ade1f25 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/plugins/platforms/windows/qwindowsdialoghelpers.cpp
Change-Id: I4ca87d44129fa5c1d8541cd58b8d62bc69080688
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/opengl/cube/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/opengl/cube/main.cpp b/examples/opengl/cube/main.cpp index 715d46dde7..a414fad023 100644 --- a/examples/opengl/cube/main.cpp +++ b/examples/opengl/cube/main.cpp @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); app.setApplicationName("cube"); app.setApplicationVersion("0.1"); -#ifdef QT_NO_OPENGL +#ifndef QT_NO_OPENGL MainWidget widget; widget.show(); #else |