diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-10-15 15:58:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-17 17:18:22 +0200 |
| commit | 79fed8757e26f946745eec9d8bba8b91aeb1a742 (patch) | |
| tree | 2bf779aff001b7e9675f52ccb270a0041de06b62 /tests/auto/cmake | |
| parent | 049ca9aa5e5d6bbcf2a68be6772327a4b6ab3aa0 (diff) | |
Rename the QtQuick1 module back to QtDeclarative
Matches the name that this code used to have in Qt 4.
- Adapt library, change import path to 'QtDeclarative'.
- Update the tests and examples to match the new library name.
- Rename qtquick1global{_p}.h to qtdeclarativeglobal.h.
- Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like
it was in Qt 4 and matching the library name again. This also
changes the include guards in qtdeclarativeglobal{,_p}.h.
- Fix occurrence of quick_debug in tools/qml/qml.pro.
Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests/auto/cmake')
| -rw-r--r-- | tests/auto/cmake/test_modules/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt index 1a1352ff..95459d19 100644 --- a/tests/auto/cmake/test_modules/CMakeLists.txt +++ b/tests/auto/cmake/test_modules/CMakeLists.txt @@ -6,19 +6,19 @@ project(test_modules) find_package(Qt5Script REQUIRED) find_package(Qt5Widgets REQUIRED) -find_package(Qt5Quick1 REQUIRED) +find_package(Qt5Declarative REQUIRED) include_directories( - ${Qt5Quick1_INCLUDE_DIRS} + ${Qt5Declarative_INCLUDE_DIRS} ) add_definitions( - ${Qt5Quick1_DEFINITIONS} + ${Qt5Declarative_DEFINITIONS} ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") add_executable(mainapp main.cpp) target_link_libraries(mainapp - ${Qt5Quick1_LIBRARIES} + ${Qt5Declarative_LIBRARIES} ) |