diff options
-rw-r--r-- | tests/auto/corelib.pro | 6 | ||||
-rw-r--r-- | tests/auto/corelib/corelib.pro | 3 | ||||
-rw-r--r-- | tests/auto/corelib/global/global.pro | 8 | ||||
-rw-r--r-- | tests/auto/corelib/global/q_func_info/.gitignore (renamed from tests/auto/q_func_info/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/q_func_info/q_func_info.pro (renamed from tests/auto/q_func_info/q_func_info.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp (renamed from tests/auto/q_func_info/tst_q_func_info.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qflags/.gitignore (renamed from tests/auto/qflags/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qflags/qflags.pro (renamed from tests/auto/qflags/qflags.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qflags/tst_qflags.cpp (renamed from tests/auto/qflags/tst_qflags.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qgetputenv/.gitignore (renamed from tests/auto/qgetputenv/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qgetputenv/qgetputenv.pro (renamed from tests/auto/qgetputenv/qgetputenv.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp (renamed from tests/auto/qgetputenv/tst_qgetputenv.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qglobal/.gitignore (renamed from tests/auto/qglobal/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qglobal/qglobal.pro (renamed from tests/auto/qglobal/qglobal.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qglobal/tst_qglobal.cpp (renamed from tests/auto/qglobal/tst_qglobal.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qnumeric/.gitignore (renamed from tests/auto/qnumeric/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qnumeric/qnumeric.pro (renamed from tests/auto/qnumeric/qnumeric.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp (renamed from tests/auto/qnumeric/tst_qnumeric.cpp) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qrand/.gitignore (renamed from tests/auto/qrand/.gitignore) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qrand/qrand.pro (renamed from tests/auto/qrand/qrand.pro) | 0 | ||||
-rw-r--r-- | tests/auto/corelib/global/qrand/tst_qrand.cpp (renamed from tests/auto/qrand/tst_qrand.cpp) | 0 |
21 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/corelib.pro b/tests/auto/corelib.pro index 927d439b13..dd9f31b6d7 100644 --- a/tests/auto/corelib.pro +++ b/tests/auto/corelib.pro @@ -3,7 +3,6 @@ SUBDIRS=\ corelib \ collections \ exceptionsafety \ - q_func_info \ qatomicint \ qatomicpointer \ qbitarray \ @@ -25,10 +24,7 @@ SUBDIRS=\ qexplicitlyshareddatapointer \ qfileinfo \ qfilesystemwatcher \ - qflags \ qfreelist \ - qgetputenv \ - qglobal \ qhash \ qlibrary \ qline \ @@ -38,7 +34,6 @@ SUBDIRS=\ qmetatype \ qmutex \ qmutexlocker \ - qnumeric \ qobject \ qobjectrace \ qplugin \ @@ -46,7 +41,6 @@ SUBDIRS=\ qpoint \ qprocessenvironment \ qqueue \ - qrand \ qreadlocker \ qreadwritelock \ qrect \ diff --git a/tests/auto/corelib/corelib.pro b/tests/auto/corelib/corelib.pro index 122c834c63..bdb0231b32 100644 --- a/tests/auto/corelib/corelib.pro +++ b/tests/auto/corelib/corelib.pro @@ -2,4 +2,5 @@ TEMPLATE=subdirs SUBDIRS=\ animation \ codecs \ - concurrent + concurrent \ + global diff --git a/tests/auto/corelib/global/global.pro b/tests/auto/corelib/global/global.pro new file mode 100644 index 0000000000..e9b547be68 --- /dev/null +++ b/tests/auto/corelib/global/global.pro @@ -0,0 +1,8 @@ +TEMPLATE=subdirs +SUBDIRS=\ + qflags \ + q_func_info \ + qgetputenv \ + qglobal \ + qnumeric \ + qrand diff --git a/tests/auto/q_func_info/.gitignore b/tests/auto/corelib/global/q_func_info/.gitignore index ff7d730764..ff7d730764 100644 --- a/tests/auto/q_func_info/.gitignore +++ b/tests/auto/corelib/global/q_func_info/.gitignore diff --git a/tests/auto/q_func_info/q_func_info.pro b/tests/auto/corelib/global/q_func_info/q_func_info.pro index 64f08d4d8d..64f08d4d8d 100644 --- a/tests/auto/q_func_info/q_func_info.pro +++ b/tests/auto/corelib/global/q_func_info/q_func_info.pro diff --git a/tests/auto/q_func_info/tst_q_func_info.cpp b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp index 0a2a259462..0a2a259462 100644 --- a/tests/auto/q_func_info/tst_q_func_info.cpp +++ b/tests/auto/corelib/global/q_func_info/tst_q_func_info.cpp diff --git a/tests/auto/qflags/.gitignore b/tests/auto/corelib/global/qflags/.gitignore index 52e998ad15..52e998ad15 100644 --- a/tests/auto/qflags/.gitignore +++ b/tests/auto/corelib/global/qflags/.gitignore diff --git a/tests/auto/qflags/qflags.pro b/tests/auto/corelib/global/qflags/qflags.pro index 097a218a5a..097a218a5a 100644 --- a/tests/auto/qflags/qflags.pro +++ b/tests/auto/corelib/global/qflags/qflags.pro diff --git a/tests/auto/qflags/tst_qflags.cpp b/tests/auto/corelib/global/qflags/tst_qflags.cpp index 85e64a6d63..85e64a6d63 100644 --- a/tests/auto/qflags/tst_qflags.cpp +++ b/tests/auto/corelib/global/qflags/tst_qflags.cpp diff --git a/tests/auto/qgetputenv/.gitignore b/tests/auto/corelib/global/qgetputenv/.gitignore index c045a3cc03..c045a3cc03 100644 --- a/tests/auto/qgetputenv/.gitignore +++ b/tests/auto/corelib/global/qgetputenv/.gitignore diff --git a/tests/auto/qgetputenv/qgetputenv.pro b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro index df94f14473..df94f14473 100644 --- a/tests/auto/qgetputenv/qgetputenv.pro +++ b/tests/auto/corelib/global/qgetputenv/qgetputenv.pro diff --git a/tests/auto/qgetputenv/tst_qgetputenv.cpp b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp index 9ad98122bc..9ad98122bc 100644 --- a/tests/auto/qgetputenv/tst_qgetputenv.cpp +++ b/tests/auto/corelib/global/qgetputenv/tst_qgetputenv.cpp diff --git a/tests/auto/qglobal/.gitignore b/tests/auto/corelib/global/qglobal/.gitignore index 5b3248d6cf..5b3248d6cf 100644 --- a/tests/auto/qglobal/.gitignore +++ b/tests/auto/corelib/global/qglobal/.gitignore diff --git a/tests/auto/qglobal/qglobal.pro b/tests/auto/corelib/global/qglobal/qglobal.pro index a4dffac815..a4dffac815 100644 --- a/tests/auto/qglobal/qglobal.pro +++ b/tests/auto/corelib/global/qglobal/qglobal.pro diff --git a/tests/auto/qglobal/tst_qglobal.cpp b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp index 19a13f6ad0..19a13f6ad0 100644 --- a/tests/auto/qglobal/tst_qglobal.cpp +++ b/tests/auto/corelib/global/qglobal/tst_qglobal.cpp diff --git a/tests/auto/qnumeric/.gitignore b/tests/auto/corelib/global/qnumeric/.gitignore index c00531dd33..c00531dd33 100644 --- a/tests/auto/qnumeric/.gitignore +++ b/tests/auto/corelib/global/qnumeric/.gitignore diff --git a/tests/auto/qnumeric/qnumeric.pro b/tests/auto/corelib/global/qnumeric/qnumeric.pro index c0af962a79..c0af962a79 100644 --- a/tests/auto/qnumeric/qnumeric.pro +++ b/tests/auto/corelib/global/qnumeric/qnumeric.pro diff --git a/tests/auto/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp index 8eb4e468a1..8eb4e468a1 100644 --- a/tests/auto/qnumeric/tst_qnumeric.cpp +++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp diff --git a/tests/auto/qrand/.gitignore b/tests/auto/corelib/global/qrand/.gitignore index e8ec2ebfd1..e8ec2ebfd1 100644 --- a/tests/auto/qrand/.gitignore +++ b/tests/auto/corelib/global/qrand/.gitignore diff --git a/tests/auto/qrand/qrand.pro b/tests/auto/corelib/global/qrand/qrand.pro index 0db8af821c..0db8af821c 100644 --- a/tests/auto/qrand/qrand.pro +++ b/tests/auto/corelib/global/qrand/qrand.pro diff --git a/tests/auto/qrand/tst_qrand.cpp b/tests/auto/corelib/global/qrand/tst_qrand.cpp index 7ac778211c..7ac778211c 100644 --- a/tests/auto/qrand/tst_qrand.cpp +++ b/tests/auto/corelib/global/qrand/tst_qrand.cpp |