diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-12 07:49:03 +0200 |
| commit | a9ac6da893ac10ce160c9eb80141508881cd71e2 (patch) | |
| tree | 0e74067407612d44ad07ff74cb7be6d444ee28c5 /tests/auto/dbus/dbus.pro | |
| parent | 8eb5ba3b9cb1e8e07f28a3153672a946b2d82fd9 (diff) | |
| parent | 687461627310e8b781da15d1a907c35bd8ffea6e (diff) | |
Merge branch 'master' into refactor
Conflicts:
src/3rdparty/v8
src/gui/text/qfont_qpa.cpp
src/gui/widgets/qlinecontrol.cpp
src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
tests/auto/gui.pro
tests/auto/network.pro
tests/auto/qstring/tst_qstring.cpp
Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe
Diffstat (limited to 'tests/auto/dbus/dbus.pro')
| -rw-r--r-- | tests/auto/dbus/dbus.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/dbus/dbus.pro b/tests/auto/dbus/dbus.pro index 6dd8ce325c..cd845d7043 100644 --- a/tests/auto/dbus/dbus.pro +++ b/tests/auto/dbus/dbus.pro @@ -18,3 +18,6 @@ SUBDIRS=\ qdbusthreading \ qdbusxmlparser \ +!contains(QT_CONFIG,private_tests): SUBDIRS -= \ + qdbusmarshall \ + |