From d675004dbac12a938cf60fac39e5b9b81bbb6a99 Mon Sep 17 00:00:00 2001
From: Sebastian Holtermann <sebholt@xwmw.org>
Date: Fri, 25 Nov 2016 13:19:32 +0100
Subject: QtAutogen tests: Rename uiconly target to camel case uicOnly

Also move uicOnly sources to dedicated uicOnlySource directory.
---
 Tests/QtAutogen/CMakeLists.txt            | 10 ++++++----
 Tests/QtAutogen/sub/uiconly.cpp           | 13 -------------
 Tests/QtAutogen/sub/uiconly.h             | 20 --------------------
 Tests/QtAutogen/sub/uiconly.ui            | 24 ------------------------
 Tests/QtAutogen/uicOnlySource/uiconly.cpp | 13 +++++++++++++
 Tests/QtAutogen/uicOnlySource/uiconly.h   | 20 ++++++++++++++++++++
 Tests/QtAutogen/uicOnlySource/uiconly.ui  | 24 ++++++++++++++++++++++++
 7 files changed, 63 insertions(+), 61 deletions(-)
 delete mode 100644 Tests/QtAutogen/sub/uiconly.cpp
 delete mode 100644 Tests/QtAutogen/sub/uiconly.h
 delete mode 100644 Tests/QtAutogen/sub/uiconly.ui
 create mode 100644 Tests/QtAutogen/uicOnlySource/uiconly.cpp
 create mode 100644 Tests/QtAutogen/uicOnlySource/uiconly.h
 create mode 100644 Tests/QtAutogen/uicOnlySource/uiconly.ui

diff --git a/Tests/QtAutogen/CMakeLists.txt b/Tests/QtAutogen/CMakeLists.txt
index b0bc100..6a5d7b5 100644
--- a/Tests/QtAutogen/CMakeLists.txt
+++ b/Tests/QtAutogen/CMakeLists.txt
@@ -54,6 +54,12 @@ add_executable(rccEmpty rccEmpty.cpp rccEmptyRes.qrc)
 set_property(TARGET rccEmpty PROPERTY AUTORCC ON)
 target_link_libraries(rccEmpty ${QT_QTCORE_TARGET})
 
+# -- Test: UIC only
+qtx_wrap_cpp(uicOnlyMoc uicOnlySource/uiconly.h)
+add_executable(uicOnly uicOnlySource/uiconly.cpp ${uicOnlyMoc})
+set_property(TARGET uicOnly PROPERTY AUTOUIC ON)
+target_link_libraries(uicOnly ${QT_LIBRARIES})
+
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 add_definitions(-DFOO -DSomeDefine="Barx")
 
@@ -147,10 +153,6 @@ target_link_libraries(empty no_link_language)
 add_library(no_link_language STATIC empty.h)
 set_target_properties(no_link_language PROPERTIES AUTOMOC TRUE)
 
-qtx_wrap_cpp(uicOnlyMoc sub/uiconly.h)
-add_executable(uiconly sub/uiconly.cpp ${uicOnlyMoc})
-target_link_libraries(uiconly ${QT_LIBRARIES})
-
 try_compile(RCC_DEPENDS
   "${CMAKE_CURRENT_BINARY_DIR}/autorcc_depends"
   "${CMAKE_CURRENT_SOURCE_DIR}/autorcc_depends"
diff --git a/Tests/QtAutogen/sub/uiconly.cpp b/Tests/QtAutogen/sub/uiconly.cpp
deleted file mode 100644
index ac22789..0000000
--- a/Tests/QtAutogen/sub/uiconly.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-
-#include "uiconly.h"
-
-UicOnly::UicOnly(QWidget* parent)
-  : QWidget(parent)
-  , ui(new Ui::UicOnly)
-{
-}
-
-int main()
-{
-  return 0;
-}
diff --git a/Tests/QtAutogen/sub/uiconly.h b/Tests/QtAutogen/sub/uiconly.h
deleted file mode 100644
index 9b0b1b4..0000000
--- a/Tests/QtAutogen/sub/uiconly.h
+++ /dev/null
@@ -1,20 +0,0 @@
-
-#ifndef UIC_ONLY_H
-#define UIC_ONLY_H
-
-#include <QWidget>
-#include <memory>
-
-#include "ui_uiconly.h"
-
-class UicOnly : public QWidget
-{
-  Q_OBJECT
-public:
-  explicit UicOnly(QWidget* parent = 0);
-
-private:
-  const std::auto_ptr<Ui::UicOnly> ui;
-};
-
-#endif
diff --git a/Tests/QtAutogen/sub/uiconly.ui b/Tests/QtAutogen/sub/uiconly.ui
deleted file mode 100644
index 13fb832..0000000
--- a/Tests/QtAutogen/sub/uiconly.ui
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>UicOnly</class>
- <widget class="QWidget" name="UicOnly">
-  <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/uicOnlySource/uiconly.cpp b/Tests/QtAutogen/uicOnlySource/uiconly.cpp
new file mode 100644
index 0000000..ac22789
--- /dev/null
+++ b/Tests/QtAutogen/uicOnlySource/uiconly.cpp
@@ -0,0 +1,13 @@
+
+#include "uiconly.h"
+
+UicOnly::UicOnly(QWidget* parent)
+  : QWidget(parent)
+  , ui(new Ui::UicOnly)
+{
+}
+
+int main()
+{
+  return 0;
+}
diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.h b/Tests/QtAutogen/uicOnlySource/uiconly.h
new file mode 100644
index 0000000..9b0b1b4
--- /dev/null
+++ b/Tests/QtAutogen/uicOnlySource/uiconly.h
@@ -0,0 +1,20 @@
+
+#ifndef UIC_ONLY_H
+#define UIC_ONLY_H
+
+#include <QWidget>
+#include <memory>
+
+#include "ui_uiconly.h"
+
+class UicOnly : public QWidget
+{
+  Q_OBJECT
+public:
+  explicit UicOnly(QWidget* parent = 0);
+
+private:
+  const std::auto_ptr<Ui::UicOnly> ui;
+};
+
+#endif
diff --git a/Tests/QtAutogen/uicOnlySource/uiconly.ui b/Tests/QtAutogen/uicOnlySource/uiconly.ui
new file mode 100644
index 0000000..13fb832
--- /dev/null
+++ b/Tests/QtAutogen/uicOnlySource/uiconly.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>UicOnly</class>
+ <widget class="QWidget" name="UicOnly">
+  <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