From df43b9a06a73759ba74f23d9c3e91bd0347d1026 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 27 Mar 2012 01:54:21 +0200 Subject: Don't use the pri depends line for link dependencies. That is not what depends is for. Change-Id: Iabf93e890f009bd6c8fcc18dde1891bf20a493f1 Reviewed-by: Clinton Stimpson Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly --- tests/manual/cmake/CMakeLists.txt | 3 ++- tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt | 6 +++--- tests/manual/cmake/pass1/CMakeLists.txt | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'tests/manual/cmake') diff --git a/tests/manual/cmake/CMakeLists.txt b/tests/manual/cmake/CMakeLists.txt index 2d0164a47b..f79d078baa 100644 --- a/tests/manual/cmake/CMakeLists.txt +++ b/tests/manual/cmake/CMakeLists.txt @@ -83,7 +83,8 @@ else() message("CMake version older than 2.8.7. Not running test \"pass1\"") endif() expect_pass(pass2) -expect_pass(pass3) +# Modules do not currently find their own dependencies. +# expect_pass(pass3) expect_fail(fail4) expect_fail(fail5) expect_pass("pass(needsquoting)6") diff --git a/tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt b/tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt index 63f675df18..7b9561c588 100644 --- a/tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt +++ b/tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt @@ -9,14 +9,14 @@ find_package(Qt5Widgets REQUIRED) include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) -add_definitions(${Qt5Core_DEFINITIONS}) +add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) set(CMAKE_INCLUDE_CURRENT_DIR ON) qt5_wrap_cpp(moc_files mywidget.h) qt5_wrap_ui(ui_files mywidget.ui) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") add_executable(mywidget mywidget.cpp ${moc_files} ${ui_files}) -target_link_libraries(mywidget ${Qt5Widgets_LIBRARIES}) +target_link_libraries(mywidget ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/pass1/CMakeLists.txt b/tests/manual/cmake/pass1/CMakeLists.txt index cbe3afc7c4..970ca33078 100644 --- a/tests/manual/cmake/pass1/CMakeLists.txt +++ b/tests/manual/cmake/pass1/CMakeLists.txt @@ -43,6 +43,9 @@ endmacro() add_executable(two two.cpp) add_executable(three three.cpp) +qt5_use_package(two Core) qt5_use_package(two Test) qt5_use_package(three Widgets) +qt5_use_package(three Gui) +qt5_use_package(three Core) qt5_use_package(three Test) -- cgit v1.2.3 From e979012a2fd96aaf534c633caeb67543072d7366 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 4 Apr 2012 14:29:48 +0200 Subject: Make sure we create an application before a QWidget. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2e48f9ca59df62ac28d3cecdb6c2b741c59075de Reviewed-by: João Abecasis --- tests/manual/cmake/pass(needsquoting)6/mywidget.cpp | 1 + tests/manual/cmake/pass3/mywidget.cpp | 1 + 2 files changed, 2 insertions(+) (limited to 'tests/manual/cmake') diff --git a/tests/manual/cmake/pass(needsquoting)6/mywidget.cpp b/tests/manual/cmake/pass(needsquoting)6/mywidget.cpp index d1b2669980..7f8923810d 100644 --- a/tests/manual/cmake/pass(needsquoting)6/mywidget.cpp +++ b/tests/manual/cmake/pass(needsquoting)6/mywidget.cpp @@ -50,6 +50,7 @@ MyWidget::MyWidget(QWidget *parent) int main(int argc, char **argv) { + QApplication app(argc, argv); MyWidget myWidget; return 0; } diff --git a/tests/manual/cmake/pass3/mywidget.cpp b/tests/manual/cmake/pass3/mywidget.cpp index d1b2669980..7f8923810d 100644 --- a/tests/manual/cmake/pass3/mywidget.cpp +++ b/tests/manual/cmake/pass3/mywidget.cpp @@ -50,6 +50,7 @@ MyWidget::MyWidget(QWidget *parent) int main(int argc, char **argv) { + QApplication app(argc, argv); MyWidget myWidget; return 0; } -- cgit v1.2.3