diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 12:48:01 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-10 15:31:45 +0200 |
| commit | 143c4d3e13a430b951f4f4f8c28db14303f80605 (patch) | |
| tree | 2b89637b93fc7d81c674106008566010f986d67c /tests/manual/cmake | |
| parent | a7ed81b557d593a8ddb43b71bf4bbf3b44ead070 (diff) | |
| parent | e5337ad1b1fb02873ce7b5ca8db45f6fd8063352 (diff) | |
Merge remote-tracking branch 'origin/master' into api_changes
Conflicts:
configure
src/widgets/styles/qwindowsxpstyle.cpp
tests/auto/gui/kernel/qwindow/qwindow.pro
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3
Diffstat (limited to 'tests/manual/cmake')
| -rw-r--r-- | tests/manual/cmake/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | tests/manual/cmake/pass(needsquoting)6/mywidget.cpp | 1 | ||||
| -rw-r--r-- | tests/manual/cmake/pass1/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/manual/cmake/pass3/mywidget.cpp | 1 |
5 files changed, 10 insertions, 4 deletions
diff --git a/tests/manual/cmake/CMakeLists.txt b/tests/manual/cmake/CMakeLists.txt index 241454e763..f7b16946c1 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/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/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) 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; } |