diff options
| author | Brad King <brad.king@kitware.com> | 2019-12-18 05:28:27 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-12-18 05:34:27 -0500 |
| commit | 7fa7f55230fda5ac0135b1f4a220c15ad5983857 (patch) | |
| tree | bfea0ed3fd5aedc07ba48262c134c8d4371925b2 /Tests | |
| parent | 4771c4e447c88a0e6a361d98c2c6f44ac7746ad3 (diff) | |
| download | cmake-7fa7f55230fda5ac0135b1f4a220c15ad5983857.tar.gz | |
Autogen: Revert processing of .hh files for compatibility
Since commit 4a9154537c (Autogen: Use cmake::IsHeader/SourceExtension
for file type detection, 2019-07-02, v3.16.0-rc1~470^2~4) we process
`.hh` files with `AUTOMOC`. However, this change can break existing
projects that do not expect the behavior. Revert it for now. It can
be restored later via a policy.
Fixes: #20101
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/QtAutogen/SameName/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/QtAutogen/SameName/main.cpp | 2 | ||||
| -rw-r--r-- | Tests/QtAutogen/SameName/object.hh | 13 |
3 files changed, 0 insertions, 16 deletions
diff --git a/Tests/QtAutogen/SameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt index 1919cc739d..cd29a2a852 100644 --- a/Tests/QtAutogen/SameName/CMakeLists.txt +++ b/Tests/QtAutogen/SameName/CMakeLists.txt @@ -18,7 +18,6 @@ add_executable(sameName ccc/data.qrc item.cpp object.h - object.hh object.h++ object.hpp object.hxx diff --git a/Tests/QtAutogen/SameName/main.cpp b/Tests/QtAutogen/SameName/main.cpp index 725f4cd7bf..19a6f6d1bb 100644 --- a/Tests/QtAutogen/SameName/main.cpp +++ b/Tests/QtAutogen/SameName/main.cpp @@ -6,7 +6,6 @@ #include "item.hpp" #include "object.h" #include "object.h++" -#include "object.hh" #include "object.hpp" #include "object.hxx" #include "object_upper_ext.H" @@ -22,7 +21,6 @@ int main(int argv, char** args) ::ccc::Item ccc_item; // Object instances ::Object_h obj_h; - ::Object_hh obj_hh; ::Object_hplpl obj_hplpl; ::Object_hpp obj_hpp; ::Object_hxx obj_hxx; diff --git a/Tests/QtAutogen/SameName/object.hh b/Tests/QtAutogen/SameName/object.hh deleted file mode 100644 index 3e16f83328..0000000000 --- a/Tests/QtAutogen/SameName/object.hh +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef OBJECT_HH -#define OBJECT_HH - -#include <QObject> - -class Object_hh : public QObject -{ - Q_OBJECT - Q_SLOT - void go(){}; -}; - -#endif |