diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-11-03 10:57:23 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-05 02:31:14 +0100 |
| commit | 15d25dc6763427414b96a5ecd739d0e9ee047456 (patch) | |
| tree | 3a93d34aba45e5b69fdfdeb6b8bb10c9c830757a /tests | |
| parent | 59309fa404d25cac3200068789f7c659b82db132 (diff) | |
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 <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/kernel.pro | 1 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro (renamed from tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro) | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/kernel/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp (renamed from tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp) | 0 | ||||
| -rw-r--r-- | tests/auto/other.pro | 7 |
5 files changed, 2 insertions, 8 deletions
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 index eb9810dd53..eb9810dd53 100644 --- a/tests/auto/qmetaobjectbuilder/qmetaobjectbuilder.pro +++ b/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 index d7ca8e6f1e..d7ca8e6f1e 100644 --- a/tests/auto/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp +++ b/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 |