From c71ad953fb86af763c9f8b192abadde87ce4fe6a Mon Sep 17 00:00:00 2001 From: David Faure Date: Tue, 18 Dec 2012 11:26:49 +0100 Subject: Rename "support" to "extras" everywhere, to match the new module name Change-Id: Ic089aa287b38b756bb9f0bc252c4120859afcefa Reviewed-by: Richard J. Moore --- tests/auto/cmake/test_qx11_module/CMakeLists.txt | 8 ++++---- tests/auto/cmake/test_qx11_module/main.cpp | 6 +++--- tests/auto/qx11info/qx11info.pro | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'tests') diff --git a/tests/auto/cmake/test_qx11_module/CMakeLists.txt b/tests/auto/cmake/test_qx11_module/CMakeLists.txt index d6f050e..016cf5f 100644 --- a/tests/auto/cmake/test_qx11_module/CMakeLists.txt +++ b/tests/auto/cmake/test_qx11_module/CMakeLists.txt @@ -6,14 +6,14 @@ project(test_qx11_module) find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) -find_package(Qt5X11Support REQUIRED) +find_package(Qt5X11Extras REQUIRED) include_directories( - ${Qt5X11Support_INCLUDE_DIRS} + ${Qt5X11Extras_INCLUDE_DIRS} ) add_definitions( - ${Qt5X11Support_DEFINITIONS} + ${Qt5X11Extras_DEFINITIONS} ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") @@ -21,5 +21,5 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") add_executable(mainapp main.cpp) target_link_libraries(mainapp - ${Qt5X11Support_LIBRARIES} + ${Qt5X11Extras_LIBRARIES} ) diff --git a/tests/auto/cmake/test_qx11_module/main.cpp b/tests/auto/cmake/test_qx11_module/main.cpp index 932521f..41f22da 100644 --- a/tests/auto/cmake/test_qx11_module/main.cpp +++ b/tests/auto/cmake/test_qx11_module/main.cpp @@ -1,8 +1,8 @@ #include -#include -#include -#include +#include +#include +#include int main(int argc, char **argv) { diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro index 2833705..9059baa 100644 --- a/tests/auto/qx11info/qx11info.pro +++ b/tests/auto/qx11info/qx11info.pro @@ -1,4 +1,4 @@ CONFIG += testcase TARGET = tst_qx11info -QT += x11support widgets testlib +QT += x11extras widgets testlib SOURCES += tst_qx11info.cpp -- cgit v1.2.1