2 files changed, 8 insertions, 39 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index dfcb225555..64b2b8acec 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -78,11 +78,11 @@ macro(expect_fail _dir)
   )
 endmacro()
 
-if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.7)
-    # Requires CMAKE_AUTOMOC function in CMake 2.8.7
+if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8)
+    # Requires INCLUDE_DIRECTORIES target property in CMake 2.8.8
     expect_pass(pass1)
 else()
-    message("CMake version older than 2.8.7 (Found ${CMAKE_VERSION}). Not running test \"pass1\"")
+    message("CMake version older than 2.8.8 (Found ${CMAKE_VERSION}). Not running test \"pass1\"")
 endif()
 expect_pass(pass2)
 expect_pass(pass3)
diff --git a/tests/auto/cmake/pass1/CMakeLists.txt b/tests/auto/cmake/pass1/CMakeLists.txt
index cbe3afc7c4..d8efadc8ed 100644
--- a/tests/auto/cmake/pass1/CMakeLists.txt
+++ b/tests/auto/cmake/pass1/CMakeLists.txt
@@ -7,42 +7,11 @@ set(CMAKE_AUTOMOC ON)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-macro(qt5_use_package _target _package)
-    if (NOT Qt5${_package}_FOUND)
-        find_package(Qt5${_package} ${ARG1})
-    endif()
-    if (Qt5${_package}_FOUND)
-        # TODO: Handle public/private keywords?
-        target_link_libraries(${_target} ${Qt5${_package}_LIBRARIES})
-        # ### Requires CMake 2.8.8:
-        # set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_package}_INCLUDE_DIRS})
-        include_directories(${Qt5${_package}_INCLUDE_DIRS})
-        set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_package}_COMPILE_DEFINITIONS})
-
-        # We can't just append to the COMPILE_FLAGS property. That creats a ';' separated list
-        # which breaks the compile commmand line.
-        # Ensure non-duplication here manually instead.
-        get_property(_taget_type TARGET ${_target} PROPERTY TYPE)
-        if ("${_taget_type}" STREQUAL "EXECUTABLE")
-          get_target_property(_flags ${_target} COMPILE_FLAGS)
-          if (_flags)
-            list(APPEND _flags ${Qt5${_package}_EXECUTABLE_COMPILE_FLAGS})
-            list(REMOVE_DUPLICATES _flags)
-          else()
-            set(_flags ${Qt5${_package}_EXECUTABLE_COMPILE_FLAGS})
-          endif()
-          if (_flags)
-            set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${_flags})
-          endif()
-        endif()
-    else()
-        message(FATAL_ERROR "NOT FOUND: Qt5${_package}")
-    endif()
-endmacro()
-
 add_executable(two two.cpp)
 add_executable(three three.cpp)
 
-qt5_use_package(two Test)
-qt5_use_package(three Widgets)
-qt5_use_package(three Test)
+find_package(Qt5Test)
+find_package(Qt5Widgets)
+
+qt5_use_modules(two Test)
+qt5_use_modules(three Widgets Test)