AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow specification of a namespace for modules under test.

Browse Source 
Change-Id: I957d662d677766732f324e48a6bc42f23f1a444c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
This commit is contained in:
Stephen Kelly 2013-03-19 23:21:08 +01:00 committed by The Qt Project
parent ecb20e57d4
commit a45a80f322
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/Qt5CTestMacros.cmake
View File

@ -135,6 +135,11 @@ function(test_module_includes)
while(all_args) while(all_args)
list(GET all_args 0 qtmodule) list(GET all_args 0 qtmodule)
list(GET all_args 1 qtclass) list(GET all_args 1 qtclass)
if (${qtclass}_NAMESPACE)
set(qtinstancetype ${${qtclass}_NAMESPACE}::${qtclass})
else()
set(qtinstancetype ${qtclass})
endif()
list(REMOVE_AT all_args 0 1) list(REMOVE_AT all_args 0 1)
set(includes_string set(includes_string
"${includes_string} "${includes_string}
@ -145,7 +150,7 @@ function(test_module_includes)
) )
set(instances_string set(instances_string
"${instances_string} "${instances_string}
${qtclass} local${qtclass}; ${qtinstancetype} local${qtclass};
") ")
endwhile() endwhile()