Merge topic 'automoc-src-per-dir'

9beb2744 Automoc: Fix support of files with the same name (#12873)

5 files changed, 27 insertions, 1 deletions

diff --git a/Tests/QtAutogen/Adir/CMakeLists.txt b/Tests/QtAutogen/Adir/CMakeLists.txt
index a1c36ff..0c7848d 100644
--- a/Tests/QtAutogen/Adir/CMakeLists.txt
+++ b/Tests/QtAutogen/Adir/CMakeLists.txt
@@ -3,6 +3,6 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE ON)
 
-add_library(libA SHARED libA.cpp)
+add_library(libA SHARED libA.cpp foo.cpp bar/foo.cpp)
 target_link_libraries(libA LINK_PUBLIC ${QT_QTCORE_TARGET})
 generate_export_header(libA)
diff --git a/Tests/QtAutogen/Adir/bar/foo.cpp b/Tests/QtAutogen/Adir/bar/foo.cpp
new file mode 100644
index 0000000..3f5e0a9
--- /dev/null
+++ b/Tests/QtAutogen/Adir/bar/foo.cpp
@@ -0,0 +1,4 @@
+#include "foo.h"
+
+bar::foo::foo() {}
+bar::foo::~foo() {}
diff --git a/Tests/QtAutogen/Adir/bar/foo.h b/Tests/QtAutogen/Adir/bar/foo.h
new file mode 100644
index 0000000..daf2367
--- /dev/null
+++ b/Tests/QtAutogen/Adir/bar/foo.h
@@ -0,0 +1,10 @@
+#include <QObject>
+
+namespace bar {
+  class foo: public QObject {
+    Q_OBJECT
+  public:
+    foo();
+    ~foo();
+  };
+}
diff --git a/Tests/QtAutogen/Adir/foo.cpp b/Tests/QtAutogen/Adir/foo.cpp
new file mode 100644
index 0000000..86e4d8e
--- /dev/null
+++ b/Tests/QtAutogen/Adir/foo.cpp
@@ -0,0 +1,4 @@
+#include "foo.h"
+
+foo::foo() {}
+foo::~foo() {}
diff --git a/Tests/QtAutogen/Adir/foo.h b/Tests/QtAutogen/Adir/foo.h
new file mode 100644
index 0000000..a51960c
--- /dev/null
+++ b/Tests/QtAutogen/Adir/foo.h
@@ -0,0 +1,8 @@
+#include <QObject>
+
+class foo: public QObject {
+  Q_OBJECT
+public:
+  foo();
+  ~foo();
+};