From 45b6776ab301f4b5ec51e27863ffe061b1a0d60a Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Fri, 8 Dec 2017 20:12:30 +0100
Subject: Autogen: Tests: Separate SameName test

---
 Tests/QtAutogen/CMakeLists.txt            |  4 ----
 Tests/QtAutogen/CommonTests.cmake         |  1 +
 Tests/QtAutogen/SameName/CMakeLists.txt   | 39 +++++++++++++++++++++++++++++++
 Tests/QtAutogen/SameName/aaa/bbb/data.qrc |  6 +++++
 Tests/QtAutogen/SameName/aaa/bbb/item.cpp | 22 +++++++++++++++++
 Tests/QtAutogen/SameName/aaa/bbb/item.hpp | 18 ++++++++++++++
 Tests/QtAutogen/SameName/aaa/data.qrc     |  6 +++++
 Tests/QtAutogen/SameName/aaa/item.cpp     | 22 +++++++++++++++++
 Tests/QtAutogen/SameName/aaa/item.hpp     | 18 ++++++++++++++
 Tests/QtAutogen/SameName/aaa/view.ui      | 24 +++++++++++++++++++
 Tests/QtAutogen/SameName/bbb/aaa/data.qrc |  6 +++++
 Tests/QtAutogen/SameName/bbb/aaa/item.cpp | 22 +++++++++++++++++
 Tests/QtAutogen/SameName/bbb/aaa/item.hpp | 18 ++++++++++++++
 Tests/QtAutogen/SameName/bbb/data.qrc     |  6 +++++
 Tests/QtAutogen/SameName/bbb/item.cpp     | 23 ++++++++++++++++++
 Tests/QtAutogen/SameName/bbb/item.hpp     | 17 ++++++++++++++
 Tests/QtAutogen/SameName/bbb/view.ui      | 24 +++++++++++++++++++
 Tests/QtAutogen/SameName/ccc/data.qrc     |  6 +++++
 Tests/QtAutogen/SameName/ccc/item.cpp     | 25 ++++++++++++++++++++
 Tests/QtAutogen/SameName/ccc/item.hpp     | 18 ++++++++++++++
 Tests/QtAutogen/SameName/ccc/view.ui      | 24 +++++++++++++++++++
 Tests/QtAutogen/SameName/data.qrc         |  5 ++++
 Tests/QtAutogen/SameName/item.cpp         | 20 ++++++++++++++++
 Tests/QtAutogen/SameName/item.hpp         | 15 ++++++++++++
 Tests/QtAutogen/SameName/main.cpp         | 16 +++++++++++++
 Tests/QtAutogen/SameName/view.ui          | 24 +++++++++++++++++++
 Tests/QtAutogen/sameName/CMakeLists.txt   | 34 ---------------------------
 Tests/QtAutogen/sameName/aaa/bbb/data.qrc |  6 -----
 Tests/QtAutogen/sameName/aaa/bbb/item.cpp | 22 -----------------
 Tests/QtAutogen/sameName/aaa/bbb/item.hpp | 18 --------------
 Tests/QtAutogen/sameName/aaa/data.qrc     |  6 -----
 Tests/QtAutogen/sameName/aaa/item.cpp     | 22 -----------------
 Tests/QtAutogen/sameName/aaa/item.hpp     | 18 --------------
 Tests/QtAutogen/sameName/aaa/view.ui      | 24 -------------------
 Tests/QtAutogen/sameName/bbb/aaa/data.qrc |  6 -----
 Tests/QtAutogen/sameName/bbb/aaa/item.cpp | 22 -----------------
 Tests/QtAutogen/sameName/bbb/aaa/item.hpp | 18 --------------
 Tests/QtAutogen/sameName/bbb/data.qrc     |  6 -----
 Tests/QtAutogen/sameName/bbb/item.cpp     | 23 ------------------
 Tests/QtAutogen/sameName/bbb/item.hpp     | 17 --------------
 Tests/QtAutogen/sameName/bbb/view.ui      | 24 -------------------
 Tests/QtAutogen/sameName/ccc/data.qrc     |  6 -----
 Tests/QtAutogen/sameName/ccc/item.cpp     | 25 --------------------
 Tests/QtAutogen/sameName/ccc/item.hpp     | 18 --------------
 Tests/QtAutogen/sameName/ccc/view.ui      | 24 -------------------
 Tests/QtAutogen/sameName/data.qrc         |  5 ----
 Tests/QtAutogen/sameName/item.cpp         | 20 ----------------
 Tests/QtAutogen/sameName/item.hpp         | 15 ------------
 Tests/QtAutogen/sameName/main.cpp         | 16 -------------
 Tests/QtAutogen/sameName/view.ui          | 24 -------------------
 50 files changed, 425 insertions(+), 423 deletions(-)
 create mode 100644 Tests/QtAutogen/SameName/CMakeLists.txt
 create mode 100644 Tests/QtAutogen/SameName/aaa/bbb/data.qrc
 create mode 100644 Tests/QtAutogen/SameName/aaa/bbb/item.cpp
 create mode 100644 Tests/QtAutogen/SameName/aaa/bbb/item.hpp
 create mode 100644 Tests/QtAutogen/SameName/aaa/data.qrc
 create mode 100644 Tests/QtAutogen/SameName/aaa/item.cpp
 create mode 100644 Tests/QtAutogen/SameName/aaa/item.hpp
 create mode 100644 Tests/QtAutogen/SameName/aaa/view.ui
 create mode 100644 Tests/QtAutogen/SameName/bbb/aaa/data.qrc
 create mode 100644 Tests/QtAutogen/SameName/bbb/aaa/item.cpp
 create mode 100644 Tests/QtAutogen/SameName/bbb/aaa/item.hpp
 create mode 100644 Tests/QtAutogen/SameName/bbb/data.qrc
 create mode 100644 Tests/QtAutogen/SameName/bbb/item.cpp
 create mode 100644 Tests/QtAutogen/SameName/bbb/item.hpp
 create mode 100644 Tests/QtAutogen/SameName/bbb/view.ui
 create mode 100644 Tests/QtAutogen/SameName/ccc/data.qrc
 create mode 100644 Tests/QtAutogen/SameName/ccc/item.cpp
 create mode 100644 Tests/QtAutogen/SameName/ccc/item.hpp
 create mode 100644 Tests/QtAutogen/SameName/ccc/view.ui
 create mode 100644 Tests/QtAutogen/SameName/data.qrc
 create mode 100644 Tests/QtAutogen/SameName/item.cpp
 create mode 100644 Tests/QtAutogen/SameName/item.hpp
 create mode 100644 Tests/QtAutogen/SameName/main.cpp
 create mode 100644 Tests/QtAutogen/SameName/view.ui
 delete mode 100644 Tests/QtAutogen/sameName/CMakeLists.txt
 delete mode 100644 Tests/QtAutogen/sameName/aaa/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/sameName/aaa/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/sameName/aaa/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/sameName/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/sameName/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/sameName/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/sameName/aaa/view.ui
 delete mode 100644 Tests/QtAutogen/sameName/bbb/aaa/data.qrc
 delete mode 100644 Tests/QtAutogen/sameName/bbb/aaa/item.cpp
 delete mode 100644 Tests/QtAutogen/sameName/bbb/aaa/item.hpp
 delete mode 100644 Tests/QtAutogen/sameName/bbb/data.qrc
 delete mode 100644 Tests/QtAutogen/sameName/bbb/item.cpp
 delete mode 100644 Tests/QtAutogen/sameName/bbb/item.hpp
 delete mode 100644 Tests/QtAutogen/sameName/bbb/view.ui
 delete mode 100644 Tests/QtAutogen/sameName/ccc/data.qrc
 delete mode 100644 Tests/QtAutogen/sameName/ccc/item.cpp
 delete mode 100644 Tests/QtAutogen/sameName/ccc/item.hpp
 delete mode 100644 Tests/QtAutogen/sameName/ccc/view.ui
 delete mode 100644 Tests/QtAutogen/sameName/data.qrc
 delete mode 100644 Tests/QtAutogen/sameName/item.cpp
 delete mode 100644 Tests/QtAutogen/sameName/item.hpp
 delete mode 100644 Tests/QtAutogen/sameName/main.cpp
 delete mode 100644 Tests/QtAutogen/sameName/view.ui

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index d13c826..47164d2 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -60,10 +60,6 @@ if(NON_ASCII_BDIR AND WIN32)
 endif()
 
 # -- Test
-# Source files with the same basename in different subdirectories
-add_subdirectory(sameName)
-
-# -- Test
 # Tests static library cycles
 add_subdirectory(staticLibraryCycle)
 
diff --git a/Tests/QtAutogen/CommonTests.cmake b/Tests/QtAutogen/CommonTests.cmake
index 1e2894e..7f72386 100644
--- a/Tests/QtAutogen/CommonTests.cmake
+++ b/Tests/QtAutogen/CommonTests.cmake
@@ -28,3 +28,4 @@ ADD_AUTOGEN_TEST(ObjectLibrary someProgram)
 if(APPLE AND (NOT QT_TEST_VERSION STREQUAL 4))
   ADD_AUTOGEN_TEST(MacOsFW)
 endif()
+ADD_AUTOGEN_TEST(SameName sameName)
diff --git a/Tests/QtAutogen/SameName/CMakeLists.txt b/Tests/QtAutogen/SameName/CMakeLists.txt
new file mode 100644
index 0000000..c7d6e52
--- /dev/null
+++ b/Tests/QtAutogen/SameName/CMakeLists.txt
@@ -0,0 +1,39 @@
+cmake_minimum_required(VERSION 3.10)
+project(SameName)
+include("../AutogenTest.cmake")
+
+# Test AUTOMOC and AUTORCC on source files with the same name
+# but in different subdirectories
+
+add_executable(sameName
+  aaa/bbb/item.cpp
+  aaa/bbb/data.qrc
+  aaa/item.cpp
+  aaa/data.qrc
+  bbb/aaa/item.cpp
+  bbb/aaa/data.qrc
+  bbb/item.cpp
+  bbb/data.qrc
+  ccc/item.cpp
+  ccc/data.qrc
+  item.cpp
+  data.qrc
+  main.cpp
+)
+target_link_libraries(sameName ${QT_LIBRARIES})
+set_target_properties(sameName PROPERTIES
+  AUTOMOC TRUE
+  AUTOUIC TRUE
+  AUTORCC TRUE
+)
+
+# Set different compression levels
+if (QT_TEST_VERSION STREQUAL 4)
+  set(rccCompress "-compress")
+else()
+  set(rccCompress "--compress")
+endif()
+set_target_properties(sameName PROPERTIES AUTORCC_OPTIONS "${rccCompress};0" )
+set_source_files_properties(aaa/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};1" )
+set_source_files_properties(bbb/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};2" )
+set_source_files_properties(ccc/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};3" )
diff --git a/Tests/QtAutogen/SameName/aaa/bbb/data.qrc b/Tests/QtAutogen/SameName/aaa/bbb/data.qrc
new file mode 100644
index 0000000..0ea3537
--- /dev/null
+++ b/Tests/QtAutogen/SameName/aaa/bbb/data.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="aaa/bbb">
+  <file>item.hpp</file>
+  <file>item.cpp</file>
+</qresource>
+</RCC>
diff --git a/Tests/QtAutogen/SameName/aaa/bbb/item.cpp b/Tests/QtAutogen/SameName/aaa/bbb/item.cpp
new file mode 100644
index 0000000..850206f
--- /dev/null
+++ b/Tests/QtAutogen/SameName/aaa/bbb/item.cpp
@@ -0,0 +1,22 @@
+#include "item.hpp"
+
+namespace aaa {
+namespace bbb {
+
+class MocLocal : public QObject
+{
+  Q_OBJECT;
+
+public:
+  MocLocal() = default;
+  ~MocLocal() = default;
+};
+
+void Item::go()
+{
+  MocLocal obj;
+}
+}
+}
+
+#include "aaa/bbb/item.moc"
diff --git a/Tests/QtAutogen/SameName/aaa/bbb/item.hpp b/Tests/QtAutogen/SameName/aaa/bbb/item.hpp
new file mode 100644
index 0000000..0855043
--- /dev/null
+++ b/Tests/QtAutogen/SameName/aaa/bbb/item.hpp
@@ -0,0 +1,18 @@
+#ifndef AAA_BBB_ITEM_HPP
+#define AAA_BBB_ITEM_HPP
+
+#include <QObject>
+
+namespace aaa {
+namespace bbb {
+
+class Item : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+}
+}
+
+#endif
diff --git a/Tests/QtAutogen/SameName/aaa/data.qrc b/Tests/QtAutogen/SameName/aaa/data.qrc
new file mode 100644
index 0000000..379af60
--- /dev/null
+++ b/Tests/QtAutogen/SameName/aaa/data.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="aaa/">
+  <file>item.hpp</file>
+  <file>item.cpp</file>
+</qresource>
+</RCC>
diff --git a/Tests/QtAutogen/SameName/aaa/item.cpp b/Tests/QtAutogen/SameName/aaa/item.cpp
new file mode 100644
index 0000000..e35d3d1
--- /dev/null
+++ b/Tests/QtAutogen/SameName/aaa/item.cpp
@@ -0,0 +1,22 @@
+#include "item.hpp"
+// Include ui_view.h only in header
+
+namespace aaa {
+
+class MocLocal : public QObject
+{
+  Q_OBJECT;
+
+public:
+  MocLocal() = default;
+  ~MocLocal() = default;
+};
+
+void Item::go()
+{
+  Ui_ViewAAA ui;
+  MocLocal obj;
+}
+}
+
+#include "aaa/item.moc"
diff --git a/Tests/QtAutogen/SameName/aaa/item.hpp b/Tests/QtAutogen/SameName/aaa/item.hpp
new file mode 100644
index 0000000..875f72f
--- /dev/null
+++ b/Tests/QtAutogen/SameName/aaa/item.hpp
@@ -0,0 +1,18 @@
+#ifndef AAA_ITEM_HPP
+#define AAA_ITEM_HPP
+
+#include <QObject>
+// Include ui_view.h only in header
+#include <aaa/ui_view.h>
+
+namespace aaa {
+
+class Item : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+}
+
+#endif
diff --git a/Tests/QtAutogen/SameName/aaa/view.ui b/Tests/QtAutogen/SameName/aaa/view.ui
new file mode 100644
index 0000000..0f09980
--- /dev/null
+++ b/Tests/QtAutogen/SameName/aaa/view.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ViewAAA</class>
+ <widget class="QWidget" name="Base">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTreeView" name="treeView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Tests/QtAutogen/SameName/bbb/aaa/data.qrc b/Tests/QtAutogen/SameName/bbb/aaa/data.qrc
new file mode 100644
index 0000000..da98009
--- /dev/null
+++ b/Tests/QtAutogen/SameName/bbb/aaa/data.qrc
@@ -0,0 +1,6 @@
+<!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/SameName/bbb/aaa/item.cpp b/Tests/QtAutogen/SameName/bbb/aaa/item.cpp
new file mode 100644
index 0000000..7ad01c3
--- /dev/null
+++ b/Tests/QtAutogen/SameName/bbb/aaa/item.cpp
@@ -0,0 +1,22 @@
+#include "item.hpp"
+
+namespace bbb {
+namespace aaa {
+
+class MocLocal : public QObject
+{
+  Q_OBJECT;
+
+public:
+  MocLocal() = default;
+  ~MocLocal() = default;
+};
+
+void Item::go()
+{
+  MocLocal obj;
+}
+}
+}
+
+#include "bbb/aaa/item.moc"
diff --git a/Tests/QtAutogen/SameName/bbb/aaa/item.hpp b/Tests/QtAutogen/SameName/bbb/aaa/item.hpp
new file mode 100644
index 0000000..be07ca8
--- /dev/null
+++ b/Tests/QtAutogen/SameName/bbb/aaa/item.hpp
@@ -0,0 +1,18 @@
+#ifndef BBB_AAA_ITEM_HPP
+#define BBB_AAA_ITEM_HPP
+
+#include <QObject>
+
+namespace bbb {
+namespace aaa {
+
+class Item : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+}
+}
+
+#endif
diff --git a/Tests/QtAutogen/SameName/bbb/data.qrc b/Tests/QtAutogen/SameName/bbb/data.qrc
new file mode 100644
index 0000000..5b080f5
--- /dev/null
+++ b/Tests/QtAutogen/SameName/bbb/data.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="bbb/">
+  <file>item.hpp</file>
+  <file>item.cpp</file>
+</qresource>
+</RCC>
diff --git a/Tests/QtAutogen/SameName/bbb/item.cpp b/Tests/QtAutogen/SameName/bbb/item.cpp
new file mode 100644
index 0000000..9ef128e
--- /dev/null
+++ b/Tests/QtAutogen/SameName/bbb/item.cpp
@@ -0,0 +1,23 @@
+#include "item.hpp"
+// Include ui_view.h only in source
+#include <bbb/ui_view.h>
+
+namespace bbb {
+
+class MocLocal : public QObject
+{
+  Q_OBJECT;
+
+public:
+  MocLocal() = default;
+  ~MocLocal() = default;
+};
+
+void Item::go()
+{
+  Ui_ViewBBB ui;
+  MocLocal obj;
+}
+}
+
+#include "bbb/item.moc"
diff --git a/Tests/QtAutogen/SameName/bbb/item.hpp b/Tests/QtAutogen/SameName/bbb/item.hpp
new file mode 100644
index 0000000..d39a9d7
--- /dev/null
+++ b/Tests/QtAutogen/SameName/bbb/item.hpp
@@ -0,0 +1,17 @@
+#ifndef BBB_ITEM_HPP
+#define BBB_ITEM_HPP
+
+#include <QObject>
+// Include ui_view.h only in source
+
+namespace bbb {
+
+class Item : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+}
+
+#endif
diff --git a/Tests/QtAutogen/SameName/bbb/view.ui b/Tests/QtAutogen/SameName/bbb/view.ui
new file mode 100644
index 0000000..a8f506e
--- /dev/null
+++ b/Tests/QtAutogen/SameName/bbb/view.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ViewBBB</class>
+ <widget class="QWidget" name="Base">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTreeView" name="treeView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Tests/QtAutogen/SameName/ccc/data.qrc b/Tests/QtAutogen/SameName/ccc/data.qrc
new file mode 100644
index 0000000..f934c39
--- /dev/null
+++ b/Tests/QtAutogen/SameName/ccc/data.qrc
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="ccc/">
+  <file>item.hpp</file>
+  <file>item.cpp</file>
+</qresource>
+</RCC>
diff --git a/Tests/QtAutogen/SameName/ccc/item.cpp b/Tests/QtAutogen/SameName/ccc/item.cpp
new file mode 100644
index 0000000..ab8a281
--- /dev/null
+++ b/Tests/QtAutogen/SameName/ccc/item.cpp
@@ -0,0 +1,25 @@
+#include "item.hpp"
+// Include ui_view.h in source and header
+#include <ccc/ui_view.h>
+
+namespace ccc {
+
+class MocLocal : public QObject
+{
+  Q_OBJECT;
+
+public:
+  MocLocal() = default;
+  ~MocLocal() = default;
+};
+
+void Item::go()
+{
+  Ui_ViewCCC ui;
+  MocLocal obj;
+}
+}
+
+// Include own moc files
+#include "ccc/item.moc"
+#include "moc_item.cpp"
diff --git a/Tests/QtAutogen/SameName/ccc/item.hpp b/Tests/QtAutogen/SameName/ccc/item.hpp
new file mode 100644
index 0000000..20d9dd9
--- /dev/null
+++ b/Tests/QtAutogen/SameName/ccc/item.hpp
@@ -0,0 +1,18 @@
+#ifndef CCC_ITEM_HPP
+#define CCC_ITEM_HPP
+
+#include <QObject>
+// Include ui_view.h in source and header
+#include <ccc/ui_view.h>
+
+namespace ccc {
+
+class Item : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+}
+
+#endif
diff --git a/Tests/QtAutogen/SameName/ccc/view.ui b/Tests/QtAutogen/SameName/ccc/view.ui
new file mode 100644
index 0000000..7989c69
--- /dev/null
+++ b/Tests/QtAutogen/SameName/ccc/view.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ViewCCC</class>
+ <widget class="QWidget" name="Base">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTreeView" name="treeView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Tests/QtAutogen/SameName/data.qrc b/Tests/QtAutogen/SameName/data.qrc
new file mode 100644
index 0000000..4ce0b4e
--- /dev/null
+++ b/Tests/QtAutogen/SameName/data.qrc
@@ -0,0 +1,5 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+  <file>main.cpp</file>
+</qresource>
+</RCC>
diff --git a/Tests/QtAutogen/SameName/item.cpp b/Tests/QtAutogen/SameName/item.cpp
new file mode 100644
index 0000000..3d1fbe7
--- /dev/null
+++ b/Tests/QtAutogen/SameName/item.cpp
@@ -0,0 +1,20 @@
+#include "item.hpp"
+// Include ui_view.h in source and header
+#include <ui_view.h>
+
+class MocLocal : public QObject
+{
+  Q_OBJECT;
+
+public:
+  MocLocal() = default;
+  ~MocLocal() = default;
+};
+
+void Item::go()
+{
+  Ui_View ui;
+  MocLocal obj;
+}
+
+#include "item.moc"
diff --git a/Tests/QtAutogen/SameName/item.hpp b/Tests/QtAutogen/SameName/item.hpp
new file mode 100644
index 0000000..75e83f4
--- /dev/null
+++ b/Tests/QtAutogen/SameName/item.hpp
@@ -0,0 +1,15 @@
+#ifndef ITEM_HPP
+#define ITEM_HPP
+
+#include <QObject>
+// Include ui_view.h in source and header
+#include <ui_view.h>
+
+class Item : public QObject
+{
+  Q_OBJECT
+  Q_SLOT
+  void go();
+};
+
+#endif
diff --git a/Tests/QtAutogen/SameName/main.cpp b/Tests/QtAutogen/SameName/main.cpp
new file mode 100644
index 0000000..a4ffcb3
--- /dev/null
+++ b/Tests/QtAutogen/SameName/main.cpp
@@ -0,0 +1,16 @@
+#include "aaa/bbb/item.hpp"
+#include "aaa/item.hpp"
+#include "bbb/aaa/item.hpp"
+#include "bbb/item.hpp"
+#include "ccc/item.hpp"
+
+int main(int argv, char** args)
+{
+  // Object instances
+  ::aaa::Item aaa_item;
+  ::aaa::bbb::Item aaa_bbb_item;
+  ::bbb::Item bbb_item;
+  ::bbb::aaa::Item bbb_aaa_item;
+  ::ccc::Item ccc_item;
+  return 0;
+}
diff --git a/Tests/QtAutogen/SameName/view.ui b/Tests/QtAutogen/SameName/view.ui
new file mode 100644
index 0000000..2ffe734
--- /dev/null
+++ b/Tests/QtAutogen/SameName/view.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>View</class>
+ <widget class="QWidget" name="Base">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTreeView" name="treeView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/Tests/QtAutogen/sameName/CMakeLists.txt b/Tests/QtAutogen/sameName/CMakeLists.txt
deleted file mode 100644
index f695875..0000000
--- a/Tests/QtAutogen/sameName/CMakeLists.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-# Test AUTOMOC and AUTORCC on source files with the same name
-# but in different subdirectories
-
-add_executable(sameName
-  aaa/bbb/item.cpp
-  aaa/bbb/data.qrc
-  aaa/item.cpp
-  aaa/data.qrc
-  bbb/aaa/item.cpp
-  bbb/aaa/data.qrc
-  bbb/item.cpp
-  bbb/data.qrc
-  ccc/item.cpp
-  ccc/data.qrc
-  item.cpp
-  data.qrc
-  main.cpp
-)
-target_link_libraries(sameName ${QT_LIBRARIES})
-set_target_properties(sameName PROPERTIES
-  AUTOMOC TRUE
-  AUTOUIC TRUE
-  AUTORCC TRUE)
-
-# Set different compression levels
-if (QT_TEST_VERSION STREQUAL 4)
-  set(rccCompress "-compress")
-else()
-  set(rccCompress "--compress")
-endif()
-set_target_properties(sameName PROPERTIES AUTORCC_OPTIONS "${rccCompress};0" )
-set_source_files_properties(aaa/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};1" )
-set_source_files_properties(bbb/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};2" )
-set_source_files_properties(ccc/data.qrc PROPERTIES AUTORCC_OPTIONS "${rccCompress};3" )
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/data.qrc b/Tests/QtAutogen/sameName/aaa/bbb/data.qrc
deleted file mode 100644
index 0ea3537..0000000
--- a/Tests/QtAutogen/sameName/aaa/bbb/data.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="aaa/bbb">
-  <file>item.hpp</file>
-  <file>item.cpp</file>
-</qresource>
-</RCC>
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.cpp b/Tests/QtAutogen/sameName/aaa/bbb/item.cpp
deleted file mode 100644
index 850206f..0000000
--- a/Tests/QtAutogen/sameName/aaa/bbb/item.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "item.hpp"
-
-namespace aaa {
-namespace bbb {
-
-class MocLocal : public QObject
-{
-  Q_OBJECT;
-
-public:
-  MocLocal() = default;
-  ~MocLocal() = default;
-};
-
-void Item::go()
-{
-  MocLocal obj;
-}
-}
-}
-
-#include "aaa/bbb/item.moc"
diff --git a/Tests/QtAutogen/sameName/aaa/bbb/item.hpp b/Tests/QtAutogen/sameName/aaa/bbb/item.hpp
deleted file mode 100644
index 0855043..0000000
--- a/Tests/QtAutogen/sameName/aaa/bbb/item.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef AAA_BBB_ITEM_HPP
-#define AAA_BBB_ITEM_HPP
-
-#include <QObject>
-
-namespace aaa {
-namespace bbb {
-
-class Item : public QObject
-{
-  Q_OBJECT
-  Q_SLOT
-  void go();
-};
-}
-}
-
-#endif
diff --git a/Tests/QtAutogen/sameName/aaa/data.qrc b/Tests/QtAutogen/sameName/aaa/data.qrc
deleted file mode 100644
index 379af60..0000000
--- a/Tests/QtAutogen/sameName/aaa/data.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="aaa/">
-  <file>item.hpp</file>
-  <file>item.cpp</file>
-</qresource>
-</RCC>
diff --git a/Tests/QtAutogen/sameName/aaa/item.cpp b/Tests/QtAutogen/sameName/aaa/item.cpp
deleted file mode 100644
index e35d3d1..0000000
--- a/Tests/QtAutogen/sameName/aaa/item.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "item.hpp"
-// Include ui_view.h only in header
-
-namespace aaa {
-
-class MocLocal : public QObject
-{
-  Q_OBJECT;
-
-public:
-  MocLocal() = default;
-  ~MocLocal() = default;
-};
-
-void Item::go()
-{
-  Ui_ViewAAA ui;
-  MocLocal obj;
-}
-}
-
-#include "aaa/item.moc"
diff --git a/Tests/QtAutogen/sameName/aaa/item.hpp b/Tests/QtAutogen/sameName/aaa/item.hpp
deleted file mode 100644
index 875f72f..0000000
--- a/Tests/QtAutogen/sameName/aaa/item.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef AAA_ITEM_HPP
-#define AAA_ITEM_HPP
-
-#include <QObject>
-// Include ui_view.h only in header
-#include <aaa/ui_view.h>
-
-namespace aaa {
-
-class Item : public QObject
-{
-  Q_OBJECT
-  Q_SLOT
-  void go();
-};
-}
-
-#endif
diff --git a/Tests/QtAutogen/sameName/aaa/view.ui b/Tests/QtAutogen/sameName/aaa/view.ui
deleted file mode 100644
index 0f09980..0000000
--- a/Tests/QtAutogen/sameName/aaa/view.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ViewAAA</class>
- <widget class="QWidget" name="Base">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QTreeView" name="treeView"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Tests/QtAutogen/sameName/bbb/aaa/data.qrc b/Tests/QtAutogen/sameName/bbb/aaa/data.qrc
deleted file mode 100644
index da98009..0000000
--- a/Tests/QtAutogen/sameName/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/sameName/bbb/aaa/item.cpp b/Tests/QtAutogen/sameName/bbb/aaa/item.cpp
deleted file mode 100644
index 7ad01c3..0000000
--- a/Tests/QtAutogen/sameName/bbb/aaa/item.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "item.hpp"
-
-namespace bbb {
-namespace aaa {
-
-class MocLocal : public QObject
-{
-  Q_OBJECT;
-
-public:
-  MocLocal() = default;
-  ~MocLocal() = default;
-};
-
-void Item::go()
-{
-  MocLocal obj;
-}
-}
-}
-
-#include "bbb/aaa/item.moc"
diff --git a/Tests/QtAutogen/sameName/bbb/aaa/item.hpp b/Tests/QtAutogen/sameName/bbb/aaa/item.hpp
deleted file mode 100644
index be07ca8..0000000
--- a/Tests/QtAutogen/sameName/bbb/aaa/item.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef BBB_AAA_ITEM_HPP
-#define BBB_AAA_ITEM_HPP
-
-#include <QObject>
-
-namespace bbb {
-namespace aaa {
-
-class Item : public QObject
-{
-  Q_OBJECT
-  Q_SLOT
-  void go();
-};
-}
-}
-
-#endif
diff --git a/Tests/QtAutogen/sameName/bbb/data.qrc b/Tests/QtAutogen/sameName/bbb/data.qrc
deleted file mode 100644
index 5b080f5..0000000
--- a/Tests/QtAutogen/sameName/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/sameName/bbb/item.cpp b/Tests/QtAutogen/sameName/bbb/item.cpp
deleted file mode 100644
index 9ef128e..0000000
--- a/Tests/QtAutogen/sameName/bbb/item.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "item.hpp"
-// Include ui_view.h only in source
-#include <bbb/ui_view.h>
-
-namespace bbb {
-
-class MocLocal : public QObject
-{
-  Q_OBJECT;
-
-public:
-  MocLocal() = default;
-  ~MocLocal() = default;
-};
-
-void Item::go()
-{
-  Ui_ViewBBB ui;
-  MocLocal obj;
-}
-}
-
-#include "bbb/item.moc"
diff --git a/Tests/QtAutogen/sameName/bbb/item.hpp b/Tests/QtAutogen/sameName/bbb/item.hpp
deleted file mode 100644
index d39a9d7..0000000
--- a/Tests/QtAutogen/sameName/bbb/item.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef BBB_ITEM_HPP
-#define BBB_ITEM_HPP
-
-#include <QObject>
-// Include ui_view.h only in source
-
-namespace bbb {
-
-class Item : public QObject
-{
-  Q_OBJECT
-  Q_SLOT
-  void go();
-};
-}
-
-#endif
diff --git a/Tests/QtAutogen/sameName/bbb/view.ui b/Tests/QtAutogen/sameName/bbb/view.ui
deleted file mode 100644
index a8f506e..0000000
--- a/Tests/QtAutogen/sameName/bbb/view.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ViewBBB</class>
- <widget class="QWidget" name="Base">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QTreeView" name="treeView"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Tests/QtAutogen/sameName/ccc/data.qrc b/Tests/QtAutogen/sameName/ccc/data.qrc
deleted file mode 100644
index f934c39..0000000
--- a/Tests/QtAutogen/sameName/ccc/data.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="ccc/">
-  <file>item.hpp</file>
-  <file>item.cpp</file>
-</qresource>
-</RCC>
diff --git a/Tests/QtAutogen/sameName/ccc/item.cpp b/Tests/QtAutogen/sameName/ccc/item.cpp
deleted file mode 100644
index ab8a281..0000000
--- a/Tests/QtAutogen/sameName/ccc/item.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "item.hpp"
-// Include ui_view.h in source and header
-#include <ccc/ui_view.h>
-
-namespace ccc {
-
-class MocLocal : public QObject
-{
-  Q_OBJECT;
-
-public:
-  MocLocal() = default;
-  ~MocLocal() = default;
-};
-
-void Item::go()
-{
-  Ui_ViewCCC ui;
-  MocLocal obj;
-}
-}
-
-// Include own moc files
-#include "ccc/item.moc"
-#include "moc_item.cpp"
diff --git a/Tests/QtAutogen/sameName/ccc/item.hpp b/Tests/QtAutogen/sameName/ccc/item.hpp
deleted file mode 100644
index 20d9dd9..0000000
--- a/Tests/QtAutogen/sameName/ccc/item.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef CCC_ITEM_HPP
-#define CCC_ITEM_HPP
-
-#include <QObject>
-// Include ui_view.h in source and header
-#include <ccc/ui_view.h>
-
-namespace ccc {
-
-class Item : public QObject
-{
-  Q_OBJECT
-  Q_SLOT
-  void go();
-};
-}
-
-#endif
diff --git a/Tests/QtAutogen/sameName/ccc/view.ui b/Tests/QtAutogen/sameName/ccc/view.ui
deleted file mode 100644
index 7989c69..0000000
--- a/Tests/QtAutogen/sameName/ccc/view.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ViewCCC</class>
- <widget class="QWidget" name="Base">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QTreeView" name="treeView"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/Tests/QtAutogen/sameName/data.qrc b/Tests/QtAutogen/sameName/data.qrc
deleted file mode 100644
index 4ce0b4e..0000000
--- a/Tests/QtAutogen/sameName/data.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-  <file>main.cpp</file>
-</qresource>
-</RCC>
diff --git a/Tests/QtAutogen/sameName/item.cpp b/Tests/QtAutogen/sameName/item.cpp
deleted file mode 100644
index 3d1fbe7..0000000
--- a/Tests/QtAutogen/sameName/item.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "item.hpp"
-// Include ui_view.h in source and header
-#include <ui_view.h>
-
-class MocLocal : public QObject
-{
-  Q_OBJECT;
-
-public:
-  MocLocal() = default;
-  ~MocLocal() = default;
-};
-
-void Item::go()
-{
-  Ui_View ui;
-  MocLocal obj;
-}
-
-#include "item.moc"
diff --git a/Tests/QtAutogen/sameName/item.hpp b/Tests/QtAutogen/sameName/item.hpp
deleted file mode 100644
index 75e83f4..0000000
--- a/Tests/QtAutogen/sameName/item.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ITEM_HPP
-#define ITEM_HPP
-
-#include <QObject>
-// Include ui_view.h in source and header
-#include <ui_view.h>
-
-class Item : public QObject
-{
-  Q_OBJECT
-  Q_SLOT
-  void go();
-};
-
-#endif
diff --git a/Tests/QtAutogen/sameName/main.cpp b/Tests/QtAutogen/sameName/main.cpp
deleted file mode 100644
index a4ffcb3..0000000
--- a/Tests/QtAutogen/sameName/main.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "aaa/bbb/item.hpp"
-#include "aaa/item.hpp"
-#include "bbb/aaa/item.hpp"
-#include "bbb/item.hpp"
-#include "ccc/item.hpp"
-
-int main(int argv, char** args)
-{
-  // Object instances
-  ::aaa::Item aaa_item;
-  ::aaa::bbb::Item aaa_bbb_item;
-  ::bbb::Item bbb_item;
-  ::bbb::aaa::Item bbb_aaa_item;
-  ::ccc::Item ccc_item;
-  return 0;
-}
diff --git a/Tests/QtAutogen/sameName/view.ui b/Tests/QtAutogen/sameName/view.ui
deleted file mode 100644
index 2ffe734..0000000
--- a/Tests/QtAutogen/sameName/view.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>View</class>
- <widget class="QWidget" name="Base">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form</string>
-  </property>
-  <layout class="QHBoxLayout" name="horizontalLayout">
-   <item>
-    <widget class="QTreeView" name="treeView"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
-- 
cgit v0.12