Explorar el Código

QtAutoUic: Add a test for the regression in the parent commit.

Stephen Kelly hace 11 años
padre
commit
9a67373716
Se han modificado 2 ficheros con 9 adiciones y 0 borrados
  1. 6 0
      Tests/QtAutogen/CMakeLists.txt
  2. 3 0
      Tests/QtAutogen/calwidget.cpp

+ 6 - 0
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>

+ 3 - 0
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)