diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-08-06 10:10:41 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-14 21:07:00 +0200 |
commit | 1294c850cb92f1fe32dffe9073aade169fb7e26b (patch) | |
tree | 381be4b648ae4fc1de7601dd23c57dee09c1ed50 /tests | |
parent | 7d58857484ed95813fe73eb6acb7c30781338775 (diff) |
Rename the created module from QtAddonGallery to QtDocGallery
This brings things more in line with the other Qt addons.
Change-Id: I65b28425d5470be29dab5ceb1981eee725917659
Reviewed-by: Xizhi Zhu <xizhi.zhu@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/auto.pri | 2 | ||||
-rw-r--r-- | tests/auto/cmake/test_modules/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/auto/cmake/test_modules/main.cpp | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/tests/auto/auto.pri b/tests/auto/auto.pri index acd2b80..cbff713 100644 --- a/tests/auto/auto.pri +++ b/tests/auto/auto.pri @@ -1,4 +1,4 @@ TEMPLATE = app CONFIG += qt warn_on console depend_includepath testcase -QT += testlib gallery +QT += testlib docgallery diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt index 90ddee0..9d425df 100644 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/CMakeLists.txt @@ -5,19 +5,19 @@ project(test_modules) find_package(Qt5Core REQUIRED) -find_package(Qt5AddOnGallery REQUIRED) +find_package(Qt5DocGallery REQUIRED) include_directories( - ${Qt5AddOnGallery_INCLUDE_DIRS} + ${Qt5DocGallery_INCLUDE_DIRS} ) add_definitions( - ${Qt5AddOnGallery_DEFINITIONS} + ${Qt5DocGallery_DEFINITIONS} ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") add_executable(mainapp main.cpp) target_link_libraries(mainapp - ${Qt5AddOnGallery_LIBRARIES} + ${Qt5DocGallery_LIBRARIES} ) diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp index 82705fa..a7a9b65 100644 --- a/tests/auto/cmake/test_modules/main.cpp +++ b/tests/auto/cmake/test_modules/main.cpp @@ -41,9 +41,11 @@ #include <QGalleryFilter> +QT_USE_DOCGALLERY_NAMESPACE + int main(int argc, char **argv) { - QtAddOn::Gallery::QGalleryFilter galleryFilter; + QGalleryFilter galleryFilter; return 0; } |