diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 09:00:05 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2020-05-26 09:00:05 +0200 |
| commit | 227904d4a691b99789f1dc43f9b31d857279c896 (patch) | |
| tree | 37d8477c650560b7a94f508526a3bf93343ecb68 /src/plugins/cpptools/cppfilesettingspage.cpp | |
| parent | 63df649655a857599cc14dbe29a3e1647d927fb9 (diff) | |
| parent | e71c0b7fe206d607c94bda0cd2dc5d7ed249101b (diff) | |
| download | qt-creator-227904d4a691b99789f1dc43f9b31d857279c896.tar.gz | |
Merge remote-tracking branch 'origin/4.12'
Conflicts:
cmake/QtCreatorIDEBranding.cmake
qbs/modules/qtc/qtc.qbs
qtcreator_ide_branding.pri
Change-Id: Ic39945a0e3e140a9467b4b4f572929257ff3a324
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 7589b20185..68f9242ceb 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -324,6 +324,7 @@ void CppFileSettingsWidget::apply() rc.sourceSuffix = m_ui.sourceSuffixComboBox->currentText(); rc.headerSearchPaths = trimmedPaths(m_ui.headerSearchPathsEdit->text()); rc.sourceSearchPaths = trimmedPaths(m_ui.sourceSearchPathsEdit->text()); + rc.licenseTemplatePath = licenseTemplatePath(); if (rc == *m_settings) return; |