1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix typo: delyed -> delayed

Browse Source 
Change-Id: I1e9c17a85a52f15f252392426fa0b30c101c7c30
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Stephen Kelly 2012-07-20 14:54:50 +02:00 committed by Qt by Nokia
parent 1e3a986de7
commit 761e4876f6
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/cmake/CMakeLists.txt
View File

@ -28,8 +28,8 @@
# 9/11 Test #9: test_dbus_module ................. Passed 3.46 sec
# Start 10: test_multiple_find_package
# 10/11 Test #10: test_multiple_find_package ....... Passed 0.07 sec
# Start 11: test_add_resources_delyed_file
# 11/11 Test #11: test_add_resources_delyed_file ... Passed 0.38 sec
# Start 11: test_add_resources_delayed_file
# 11/11 Test #11: test_add_resources_delayed_file .. Passed 0.38 sec
#
#
# Note that if Qt is not installed, or if it is installed to a
@ -67,5 +67,5 @@ if (Qt5DBus_FOUND AND NOT APPLE)
expect_pass(test_dbus_module)
endif()
expect_pass(test_multiple_find_package)
expect_pass(test_add_resources_delyed_file)
expect_pass(test_add_resources_delayed_file)
expect_pass(test_private_includes)

10
tests/auto/cmake/test_add_resources_delyed_file/CMakeLists.txt → tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt
View File

@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 2.8)
project(test_add_resources_delyed_file)
project(test_add_resources_delayed_file)
find_package(Qt5Core REQUIRED)
@ -9,9 +9,9 @@ include_directories(${Qt5Core_INCLUDE_DIRS})
add_definitions(${Qt5Core_DEFINITIONS})
qt5_add_resources(rcc_files "${CMAKE_CURRENT_BINARY_DIR}/test_add_resources_delyed_file.qrc")
qt5_add_resources(rcc_files "${CMAKE_CURRENT_BINARY_DIR}/test_add_resources_delayed_file.qrc")
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_add_resources_delyed_file.qrc" "<!DOCTYPE RCC><RCC version=\"1.0\">
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_add_resources_delayed_file.qrc" "<!DOCTYPE RCC><RCC version=\"1.0\">
<qresource prefix=\"/\">
<file>${CMAKE_CURRENT_SOURCE_DIR}/resource_file.txt</file>
</qresource>
@ -20,5 +20,5 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/test_add_resources_delyed_file.qrc" "<!D
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
add_executable(test_add_resources_delyed_file main.cpp ${rcc_files})
target_link_libraries(test_add_resources_delyed_file ${Qt5Core_LIBRARIES})
add_executable(test_add_resources_delayed_file main.cpp ${rcc_files})
target_link_libraries(test_add_resources_delayed_file ${Qt5Core_LIBRARIES})

2
tests/auto/cmake/test_add_resources_delyed_file/main.cpp → tests/auto/cmake/test_add_resources_delayed_file/main.cpp
View File

@ -44,6 +44,6 @@
int main(int argc, char **argv)
{
// Compile error if the resource file was not created.
Q_INIT_RESOURCE(test_add_resources_delyed_file);
Q_INIT_RESOURCE(test_add_resources_delayed_file);
return 0;
}

0
tests/auto/cmake/test_add_resources_delyed_file/resource_file.txt → tests/auto/cmake/test_add_resources_delayed_file/resource_file.txt
View File