Autogen: Tests: Extend AUTOUIC include patterns test

This commit is contained in:
Sebastian Holtermann 2018-01-18 11:13:41 +01:00
parent ff91a5d54b
commit b4e6911bf5
11 changed files with 116 additions and 46 deletions

View File

@ -1,9 +1,7 @@
# Autogen tests common for Qt4 and Qt5
ADD_AUTOGEN_TEST(MocOnly mocOnly)
ADD_AUTOGEN_TEST(MocOptions mocOptions)
if(QT_TEST_ALLOW_QT_MACROS)
ADD_AUTOGEN_TEST(UicOnly uicOnly)
endif()
ADD_AUTOGEN_TEST(UicOnly uicOnly)
ADD_AUTOGEN_TEST(RccOnly rccOnly)
ADD_AUTOGEN_TEST(RccEmpty rccEmpty)
ADD_AUTOGEN_TEST(RccOffMocLibrary)

View File

@ -3,8 +3,6 @@ project(UicOnly)
include("../AutogenTest.cmake")
# Test AUTOUIC being enabled only
# The moc is provided by the Qt macro
qtx_wrap_cpp(uicOnlyMoc uiconly.h)
add_executable(uicOnly uiconly.cpp ${uicOnlyMoc})
add_executable(uicOnly main.cpp UicOnly.cpp)
set_property(TARGET uicOnly PROPERTY AUTOUIC ON)
target_link_libraries(uicOnly ${QT_LIBRARIES})

View File

@ -0,0 +1,18 @@
#include "ui_uiC.h"
#include "ui_uiD.h"
// AUTOUIC includes on the first two lines of a source file
#include "UicOnly.hpp"
UicOnly::UicOnly()
: uiA(new Ui::UiA)
, uiB(new Ui::UiB)
{
Ui::UiC uiC;
Ui::UiD uiD;
}
UicOnly::~UicOnly()
{
delete uiB;
delete uiA;
}

View File

@ -0,0 +1,15 @@
#include "ui_uiA.h"
#include "ui_uiB.h"
// AUTOUIC includes on the first two lines of a header file
#include <QObject>
class UicOnly : public QObject
{
public:
UicOnly();
~UicOnly();
private:
Ui::UiA* uiA;
Ui::UiB* uiB;
};

View File

@ -0,0 +1,7 @@
#include "UicOnly.hpp"
int main(int argc, char* argv[])
{
UicOnly uicOnly;
return 0;
}

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UicOnly</class>
<widget class="QWidget" name="UicOnly">
<class>UiA</class>
<widget class="QWidget" name="UiA">
<property name="geometry">
<rect>
<x>0</x>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UiB</class>
<widget class="QWidget" name="UiB">
<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>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UiC</class>
<widget class="QWidget" name="UiC">
<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>

View File

@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>UiD</class>
<widget class="QWidget" name="UiD">
<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>

View File

@ -1,18 +0,0 @@
#include "uiconly.h"
UicOnly::UicOnly(QWidget* parent)
: QWidget(parent)
, ui(new Ui::UicOnly)
{
}
UicOnly::~UicOnly()
{
delete ui;
}
int main()
{
return 0;
}

View File

@ -1,20 +0,0 @@
#ifndef UIC_ONLY_H
#define UIC_ONLY_H
#include <QWidget>
#include "ui_uiconly.h"
class UicOnly : public QWidget
{
Q_OBJECT
public:
explicit UicOnly(QWidget* parent = 0);
~UicOnly();
private:
Ui::UicOnly* ui;
};
#endif