diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-14 07:45:44 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-09-14 07:45:44 (GMT) |
| commit | 1b30b3a6726adf806ae221357393e562285e8346 (patch) | |
| tree | c650ff836d3abdf5890726354ee6e2b9bce11304 /src/plugins/platforms/platforms.pro | |
| parent | 1c1a5fe0e2d9e28be5e0e14732d79d34c9bb2a74 (diff) | |
| parent | 704dd92581783d91ccd234d58896d7078eed14a5 (diff) | |
| download | Qt-1b30b3a6726adf806ae221357393e562285e8346.zip Qt-1b30b3a6726adf806ae221357393e562285e8346.tar.gz Qt-1b30b3a6726adf806ae221357393e562285e8346.tar.bz2 | |
Merge remote branch 'origin/4.8' into 4.8-from-4.7
Conflicts:
src/gui/text/qtextengine_p.h
src/network/ssl/qsslsocket_openssl.cpp
Diffstat (limited to 'src/plugins/platforms/platforms.pro')
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro new file mode 100644 index 0000000..57015e7 --- /dev/null +++ b/src/plugins/platforms/platforms.pro @@ -0,0 +1,8 @@ +TEMPLATE = subdirs + +SUBDIRS += minimal + +contains(QT_CONFIG, wayland) { + SUBDIRS += wayland +} + |