summaryrefslogtreecommitdiffstats
path: root/Tests/QtAutogen/same_name/bbb
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-07-21 13:08:43 (GMT)
committerBrad King <brad.king@kitware.com>2016-07-21 13:27:19 (GMT)
commit5e55d87bdc4d14507fec2bae7a41f3fb9498db1a (patch)
tree5836ad2a646a2ee22fc6a2ebd39f229f9338251b /Tests/QtAutogen/same_name/bbb
parente31084e65745f9dd422c6aff0a2ed4ada6918805 (diff)
downloadCMake-5e55d87bdc4d14507fec2bae7a41f3fb9498db1a.zip
CMake-5e55d87bdc4d14507fec2bae7a41f3fb9498db1a.tar.gz
CMake-5e55d87bdc4d14507fec2bae7a41f3fb9498db1a.tar.bz2
Autogen: Revert changes to generate moc/rcc in subdirectories
Revert these commits: * v3.6.0-rc1~134^2 Tests: QtAutogen: Same source name in different directories test, 2016-04-13 * v3.6.0-rc1~134^2~1 Autogen: Generate qrc_NAME.cpp files in subdirectories, 2016-04-19 * v3.6.0-rc1~134^2~2 Autogen: Generate not included moc files in subdirectories, 2016-04-19 They regress existing builds that depend on the paths/symbols generated previously. Another approach will be needed to solve the name collision problem they were intended to solve. Leave the error diagnostics for the colliding cases that were added in the same topic as the above commits because they provide a useful early failure in relevant cases. Fixes #16209.
Diffstat (limited to 'Tests/QtAutogen/same_name/bbb')
-rw-r--r--Tests/QtAutogen/same_name/bbb/aaa/data.qrc6
-rw-r--r--Tests/QtAutogen/same_name/bbb/aaa/item.cpp10
-rw-r--r--Tests/QtAutogen/same_name/bbb/aaa/item.hpp18
-rw-r--r--Tests/QtAutogen/same_name/bbb/data.qrc6
-rw-r--r--Tests/QtAutogen/same_name/bbb/item.cpp8
-rw-r--r--Tests/QtAutogen/same_name/bbb/item.hpp16
6 files changed, 0 insertions, 64 deletions
diff --git a/Tests/QtAutogen/same_name/bbb/aaa/data.qrc b/Tests/QtAutogen/same_name/bbb/aaa/data.qrc
deleted file mode 100644
index da98009..0000000
--- a/Tests/QtAutogen/same_name/bbb/aaa/data.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="bbb/aaa/">
- <file>item.hpp</file>
- <file>item.cpp</file>
-</qresource>
-</RCC>
diff --git a/Tests/QtAutogen/same_name/bbb/aaa/item.cpp b/Tests/QtAutogen/same_name/bbb/aaa/item.cpp
deleted file mode 100644
index ac4b2c2..0000000
--- a/Tests/QtAutogen/same_name/bbb/aaa/item.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "item.hpp"
-
-namespace bbb {
-namespace aaa {
-
-void Item::go()
-{
-}
-}
-}
diff --git a/Tests/QtAutogen/same_name/bbb/aaa/item.hpp b/Tests/QtAutogen/same_name/bbb/aaa/item.hpp
deleted file mode 100644
index 0a8e024..0000000
--- a/Tests/QtAutogen/same_name/bbb/aaa/item.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SDB_SDA_ITEM_HPP
-#define SDB_SDA_ITEM_HPP
-
-#include <QObject>
-
-namespace bbb {
-namespace aaa {
-
-class Item : public QObject
-{
- Q_OBJECT
- Q_SLOT
- void go();
-};
-}
-}
-
-#endif
diff --git a/Tests/QtAutogen/same_name/bbb/data.qrc b/Tests/QtAutogen/same_name/bbb/data.qrc
deleted file mode 100644
index 5b080f5..0000000
--- a/Tests/QtAutogen/same_name/bbb/data.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="bbb/">
- <file>item.hpp</file>
- <file>item.cpp</file>
-</qresource>
-</RCC>
diff --git a/Tests/QtAutogen/same_name/bbb/item.cpp b/Tests/QtAutogen/same_name/bbb/item.cpp
deleted file mode 100644
index f97a143..0000000
--- a/Tests/QtAutogen/same_name/bbb/item.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "item.hpp"
-
-namespace bbb {
-
-void Item::go()
-{
-}
-}
diff --git a/Tests/QtAutogen/same_name/bbb/item.hpp b/Tests/QtAutogen/same_name/bbb/item.hpp
deleted file mode 100644
index 3da5837..0000000
--- a/Tests/QtAutogen/same_name/bbb/item.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef SDB_ITEM_HPP
-#define SDB_ITEM_HPP
-
-#include <QObject>
-
-namespace bbb {
-
-class Item : public QObject
-{
- Q_OBJECT
- Q_SLOT
- void go();
-};
-}
-
-#endif