diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:34:36 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-06-04 19:34:36 +0200 |
| commit | 80604a0786628a0c57eac7cc856720537956cc7f (patch) | |
| tree | e31b9b56584e77d6aefd4dfd072ce4e8e3648f3d /tests/manual/manual.pro | |
| parent | 1c901913c0af79b2bbde1b9da71f5267cb4fc76a (diff) | |
| parent | c11a7d16c7056da4086a87c9e85b89f8466be032 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/global/qglobal.h
src/plugins/platforms/cocoa/qnsview.mm
Change-Id: I6fe345df5c417cb7a55a3f91285d9b47a22c04fa
Diffstat (limited to 'tests/manual/manual.pro')
| -rw-r--r-- | tests/manual/manual.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index 4a466aa472..d97c69025b 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -38,7 +38,8 @@ windowmodality \ widgetgrab \ xembed-raster \ xembed-widgets \ -dialogs +dialogs \ +windowtransparency !contains(QT_CONFIG, openssl):!contains(QT_CONFIG, openssl-linked):SUBDIRS -= qssloptions @@ -49,4 +50,4 @@ win32 { } lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qnetworkreply \ -qpainfo qscreen socketengine xembed-raster xembed-widgets +qpainfo qscreen socketengine xembed-raster xembed-widgets windowtransparency |