diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-23 11:18:11 +0200 |
| commit | 084c5b3db794af1ce86b2b17455d9be5e64baebe (patch) | |
| tree | 46d29a7b89ff251c07b6fdd59c57e30f14baa64a /tests/manual/manual.pro | |
| parent | f4a0d6d2494d1dd41cd5b854a48b435120714d32 (diff) | |
| parent | 54987c6bf55b159d3ddb79461439700f6e0111f9 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
Change-Id: I18a9d83fc14f4a9afdb1e40523ec51e3fa1d7754
Diffstat (limited to 'tests/manual/manual.pro')
| -rw-r--r-- | tests/manual/manual.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro index d6c3cd8048..c04f22b53b 100644 --- a/tests/manual/manual.pro +++ b/tests/manual/manual.pro @@ -41,7 +41,8 @@ widgetgrab \ xembed-raster \ xembed-widgets \ dialogs \ -windowtransparency +windowtransparency \ +unc !contains(QT_CONFIG, openssl):!contains(QT_CONFIG, openssl-linked):SUBDIRS -= qssloptions |