summaryrefslogtreecommitdiffstats
path: root/tests/auto/cmake
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-07-20 14:54:50 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-20 20:44:06 +0200
commit761e4876f649e7b300b0d9ebe4f6bb7344f2e51a (patch)
tree0f89c587876d928dc7ef7f9aa22b35ee879c1dd5 /tests/auto/cmake
parent1e3a986de7af76c2f663b3dfab722dbc5571e387 (diff)
Fix typo: delyed -> delayed
Change-Id: I1e9c17a85a52f15f252392426fa0b30c101c7c30 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'tests/auto/cmake')
-rw-r--r--tests/auto/cmake/CMakeLists.txt6
-rw-r--r--tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt (renamed from tests/auto/cmake/test_add_resources_delyed_file/CMakeLists.txt)10
-rw-r--r--tests/auto/cmake/test_add_resources_delayed_file/main.cpp (renamed from tests/auto/cmake/test_add_resources_delyed_file/main.cpp)2
-rw-r--r--tests/auto/cmake/test_add_resources_delayed_file/resource_file.txt (renamed from tests/auto/cmake/test_add_resources_delyed_file/resource_file.txt)0
4 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 6ee8ee2126..46d1d784a8 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -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)
diff --git a/tests/auto/cmake/test_add_resources_delyed_file/CMakeLists.txt b/tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt
index a64f1680da..a2dbe76c4f 100644
--- a/tests/auto/cmake/test_add_resources_delyed_file/CMakeLists.txt
+++ b/tests/auto/cmake/test_add_resources_delayed_file/CMakeLists.txt
@@ -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})
diff --git a/tests/auto/cmake/test_add_resources_delyed_file/main.cpp b/tests/auto/cmake/test_add_resources_delayed_file/main.cpp
index 7b45dc22eb..28b1ef62ea 100644
--- a/tests/auto/cmake/test_add_resources_delyed_file/main.cpp
+++ b/tests/auto/cmake/test_add_resources_delayed_file/main.cpp
@@ -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;
}
diff --git a/tests/auto/cmake/test_add_resources_delyed_file/resource_file.txt b/tests/auto/cmake/test_add_resources_delayed_file/resource_file.txt
index 2c604a4f18..2c604a4f18 100644
--- a/tests/auto/cmake/test_add_resources_delyed_file/resource_file.txt
+++ b/tests/auto/cmake/test_add_resources_delayed_file/resource_file.txt