From 97e6d6c5d41046f4820d01ed07088ba2b2384fcf Mon Sep 17 00:00:00 2001
From: Jo Asplin <jo.asplin@nokia.com>
Date: Mon, 12 Sep 2011 09:28:19 +0200
Subject: Add other.pro back to auto.pro

The other/ subdirectory should still be built via other.pro.

This was overlooked by Commit 0a208dd4135fc16d05f9fd8c417d99e3f39c39fb

Task-number: QTBUG-21327
Change-Id: Ie8ebd7dfc5b1dd56ca1b629aa011d160cb563ddd
Reviewed-on: http://codereview.qt-project.org/4526
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/auto/auto.pro  | 2 +-
 tests/auto/other.pro | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'tests/auto')

diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 6e42c14362..5eda1236b7 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -7,7 +7,7 @@ SUBDIRS += \
     sql \
     xml \
     testlib \
-    other \
+    other.pro \
 
 !cross_compile:                             SUBDIRS += host.pro
 !cross_compile:                             SUBDIRS += tools
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 14ef9bc89c..1911d013f1 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -3,6 +3,7 @@
 
 TEMPLATE=subdirs
 SUBDIRS=\
+           other \
 #           baselineexample \ Just an example demonstrating qbaselinetest usage
            lancelot \
            qcombobox \
-- 
cgit v1.2.3