kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-autouic-regression' 

9a673737 QtAutoUic: Add a test for the regression in the parent commit.
7c585699 QtAutoUic: Restore source file AUTOUIC_OPTIONS settings
This commit is contained in:
Brad King 2015-01-12 08:57:52 -05:00 committed by CMake Topic Stage
parent af0ee41955 9a67373716
commit b4f62b875b
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmSourceFile.cxx
View File

@ -24,7 +24,7 @@ cmSourceFile::cmSourceFile(cmMakefile* mf, const std::string& name):
this->CustomCommand = 0; this->CustomCommand = 0;
this->Properties.SetCMakeInstance(mf->GetCMakeInstance()); this->Properties.SetCMakeInstance(mf->GetCMakeInstance());
this->FindFullPathFailed = false; this->FindFullPathFailed = false;
this->IsUiFile = ("ui" == this->IsUiFile = (".ui" ==
cmSystemTools::GetFilenameLastExtension(this->Location.GetName())); cmSystemTools::GetFilenameLastExtension(this->Location.GetName()));
} }

6
Tests/QtAutogen/CMakeLists.txt
View File

@ -73,6 +73,12 @@ if (CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]" AND NOT CMAKE_CONFIGURATION_
add_definitions(-DTEST_DEBUG_CLASS) add_definitions(-DTEST_DEBUG_CLASS)
endif() 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 add_executable(QtAutogen main.cpp calwidget.cpp second_widget.cpp foo.cpp blub.cpp bar.cpp abc.cpp
multiplewidgets.cpp multiplewidgets.cpp
xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot> xyz.cpp yaf.cpp gadget.cpp $<TARGET_OBJECTS:privateSlot>

3
Tests/QtAutogen/calwidget.cpp
View File

@ -50,6 +50,9 @@
#include "calwidget.h" #include "calwidget.h"
#include "ui_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() Window::Window()
: ui(new Ui::Window) : ui(new Ui::Window)