diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-06-09 19:11:56 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-06-09 19:11:56 -0700 |
| commit | 1c47a7b14394d2dec25f82c7733f704a7239d904 (patch) | |
| tree | efef934e1b9d382be8a0978af480077e70410e70 | |
| parent | 90fc31556889f503828e90813c4b3c2a6cf9cc64 (diff) | |
Add opengl to CONFIG when building on Wayland
And make sure we don't build X11 tools in tools/.
| -rw-r--r-- | mkspecs/common/wayland.conf | 4 | ||||
| -rw-r--r-- | tools/tools.pro | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/common/wayland.conf b/mkspecs/common/wayland.conf index 691634d227..a72e9413b7 100644 --- a/mkspecs/common/wayland.conf +++ b/mkspecs/common/wayland.conf @@ -1,8 +1,6 @@ MAKEFILE_GENERATOR = UNIX TARGET_PLATFORM = unix TEMPLATE = app -CONFIG += qt warn_on release incremental link_prl +CONFIG += qt warn_on release incremental link_prl opengl QT += core gui network QMAKE_INCREMENTAL_STYLE = sublib - -c diff --git a/tools/tools.pro b/tools/tools.pro index f2542307dc..14e0722b20 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -20,7 +20,7 @@ TEMPLATE = subdirs SUBDIRS += designer } } - unix:!mac:!embedded:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig + unix:!mac:!embedded:!wayland:contains(QT_CONFIG, qt3support):SUBDIRS += qtconfig win32:!wince*:SUBDIRS += activeqt } contains(QT_CONFIG, declarative):SUBDIRS += qml |