diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-12 14:00:03 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-12 14:00:03 (GMT) |
| commit | 1f41ec2ac21e75efc91bea0a786f9b2fb69e67a0 (patch) | |
| tree | 9ac00bb4443dee13d46b532317f54c3e30abf135 /Tests | |
| parent | ca5fe169aa4873af5b1ba4c6b2ecb35b84364974 (diff) | |
| parent | 9a673737163a3474c83c8100c57454318344ef1c (diff) | |
| download | CMake-1f41ec2ac21e75efc91bea0a786f9b2fb69e67a0.zip CMake-1f41ec2ac21e75efc91bea0a786f9b2fb69e67a0.tar.gz CMake-1f41ec2ac21e75efc91bea0a786f9b2fb69e67a0.tar.bz2 | |
Merge branch 'fix-autouic-regression' into release
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tests/QtAutogen/calwidget.cpp | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt index 3fd00b8..de4d0d2 100644 --- a/Tests/QtAutogen/CMakeLists.txt +++ b/Tests/QtAutogen/CMakeLists.txt @@ -73,6 +73,12 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]" AND NOT CMAKE_CONFIGURATION_ add_definitions(-DTEST_DEBUG_CLASS) endif() +# The -no-protection option disables the generation of include guards. Verify +# that setting the source file property has an effect by using this and +# issue an error in the preprocessor in calwidget.cpp if the include guard +# is defined. +set_source_files_properties(calwidget.ui PROPERTIES AUTOUIC_OPTIONS "-no-protection") + add_executable(QtAutogen main.cpp calwidget.cpp second_widget.cpp foo.cpp blub.cpp bar.cpp abc.cpp multiplewidgets.cpp xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot> diff --git a/Tests/QtAutogen/calwidget.cpp b/Tests/QtAutogen/calwidget.cpp index defde20..5f59994 100644 --- a/Tests/QtAutogen/calwidget.cpp +++ b/Tests/QtAutogen/calwidget.cpp @@ -50,6 +50,9 @@ #include "calwidget.h" #include "ui_calwidget.h" + #ifdef UI_CALWIDGET_H + #error Definition of UI_CALWIDGET_H should be disabled by file option. + #endif Window::Window() : ui(new Ui::Window) |