From 15d25dc6763427414b96a5ecd739d0e9ee047456 Mon Sep 17 00:00:00 2001 From: Jo Asplin Date: Thu, 3 Nov 2011 10:57:23 +0100 Subject: [PATCH] Moved qmetaobjectbuilder test into corelib/kernel/ This commit moves the qmetaobjectbuilder test from test/auto/ into corelib/kernel/ since that matches the location in the Qt source. Change-Id: I0342e8185ce775b0ef71849f365bf54c8fb56da4 Reviewed-by: Jason McDonald --- tests/auto/auto.pro | 2 +- tests/auto/corelib/kernel/kernel.pro | 1 + .../kernel}/qmetaobjectbuilder/qmetaobjectbuilder.pro | 0 .../kernel}/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp | 0 tests/auto/other.pro | 7 ------- 5 files changed, 2 insertions(+), 8 deletions(-) rename tests/auto/{ => corelib/kernel}/qmetaobjectbuilder/qmetaobjectbuilder.pro (100%) rename tests/auto/{ => corelib/kernel}/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp (100%) delete mode 100644 tests/auto/other.pro diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index ded314d9ba..8717739ec8 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -13,7 +13,7 @@ SUBDIRS += \ tools \ v8.pro \ xml \ - other.pro \ + other \ widgets \ cross_compile: SUBDIRS -= host.pro diff --git a/tests/auto/corelib/kernel/kernel.pro b/tests/auto/corelib/kernel/kernel.pro index 552c94d35f..037e03d9b6 100644 --- a/tests/auto/corelib/kernel/kernel.pro +++ b/tests/auto/corelib/kernel/kernel.pro @@ -6,6 +6,7 @@ SUBDIRS=\ qitemmodel \ qmath \ qmetaobject \ + qmetaobjectbuilder \ qmetatype \ qmimedata \ qobject \ diff --git a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro b/tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro similarity index 100% rename from tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro rename to tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro diff --git a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp b/tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp similarity index 100% rename from tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp rename to tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp diff --git a/tests/auto/other.pro b/tests/auto/other.pro deleted file mode 100644 index f15811940b..0000000000 --- a/tests/auto/other.pro +++ /dev/null @@ -1,7 +0,0 @@ -# These tests don't nicely fit into one of the other .pro files. -# They are testing too many Qt modules at the same time. - -TEMPLATE=subdirs -SUBDIRS=\ - other \ - qmetaobjectbuilder