mirror of https://github.com/Kitware/CMake.git
Browse Source
Merge topic 'autogen-revert-ui-rebuild' into release-3.31
Merge topic 'autogen-revert-ui-rebuild' into release-3.31
debc4d3906 Autogen: Revert adding ui files to byproducts of the timestamp target
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10056
Brad King
8 months ago
committed by
Kitware Robot
Kitware Robot
16 changed files with 79 additions and 313 deletions
-
22Source/cmQtAutoGenInitializer.cxx
-
27Tests/RunCMake/Autogen_6/RunCMakeTest.cmake
-
14Tests/RunCMake/Autogen_6/incremental_build/CMakeLists.txt
-
4Tests/RunCMake/Autogen_6/incremental_build/main.cpp
-
15Tests/RunCMake/Autogen_6/incremental_build/ui/widget.cpp
-
23Tests/RunCMake/Autogen_6/incremental_build/ui/widget.h
-
19Tests/RunCMake/Autogen_6/incremental_build/ui/widget.ui
-
25Tests/RunCMake/Autogen_6/multi_ui_files/src/mainwindow.cpp
-
22Tests/RunCMake/Autogen_6/multi_ui_files/src/mainwindow.h
-
33Tests/RunCMake/Autogen_6/multi_ui_files/src/mainwindow.ui
-
22Tests/RunCMake/Autogen_6/multi_ui_files/src/widget1.cpp
-
23Tests/RunCMake/Autogen_6/multi_ui_files/src/widget1.h
-
52Tests/RunCMake/Autogen_6/multi_ui_files/src/widget1.ui
-
22Tests/RunCMake/Autogen_6/multi_ui_files/src/widget2.cpp
-
24Tests/RunCMake/Autogen_6/multi_ui_files/src/widget2.h
-
45Tests/RunCMake/Autogen_6/multi_ui_files/src/widget2.ui
@ -1,11 +1,11 @@ |
|||
#include <QApplication>
|
|||
|
|||
#include "mainwindow.h"
|
|||
#include "ui/widget.h"
|
|||
|
|||
int main(int argc, char* argv[]) |
|||
{ |
|||
QApplication a(argc, argv); |
|||
MainWindow w; |
|||
Widget w; |
|||
w.show(); |
|||
return a.exec(); |
|||
} |
|||
@ -0,0 +1,15 @@ |
|||
#include "widget.h"
|
|||
|
|||
#include "./ui_widget.h"
|
|||
|
|||
Widget::Widget(QWidget* parent) |
|||
: QWidget(parent) |
|||
, ui(new Ui::Widget) |
|||
{ |
|||
ui->setupUi(this); |
|||
} |
|||
|
|||
Widget::~Widget() |
|||
{ |
|||
delete ui; |
|||
} |
|||
@ -0,0 +1,23 @@ |
|||
#ifndef WIDGET_H |
|||
#define WIDGET_H |
|||
|
|||
#include <QWidget> |
|||
|
|||
QT_BEGIN_NAMESPACE |
|||
namespace Ui { |
|||
class Widget; |
|||
} |
|||
QT_END_NAMESPACE |
|||
|
|||
class Widget : public QWidget |
|||
{ |
|||
Q_OBJECT |
|||
|
|||
public: |
|||
Widget(QWidget* parent = nullptr); |
|||
~Widget(); |
|||
|
|||
private: |
|||
Ui::Widget* ui; |
|||
}; |
|||
#endif // WIDGET_H |
|||
@ -0,0 +1,19 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<ui version="4.0"> |
|||
<class>Widget</class> |
|||
<widget class="QWidget" name="Widget"> |
|||
<property name="geometry"> |
|||
<rect> |
|||
<x>0</x> |
|||
<y>0</y> |
|||
<width>800</width> |
|||
<height>600</height> |
|||
</rect> |
|||
</property> |
|||
<property name="windowTitle"> |
|||
<string>Widget</string> |
|||
</property> |
|||
</widget> |
|||
<resources/> |
|||
<connections/> |
|||
</ui> |
|||
@ -1,25 +0,0 @@ |
|||
#include "mainwindow.h"
|
|||
|
|||
#include <QVBoxLayout>
|
|||
|
|||
#include "src/ui_mainwindow.h"
|
|||
#include "widget1.h"
|
|||
|
|||
MainWindow::MainWindow(QWidget* parent) |
|||
: QMainWindow(parent) |
|||
, ui(new Ui::MainWindow) |
|||
{ |
|||
ui->setupUi(this); |
|||
auto layout = new QVBoxLayout; |
|||
layout->addWidget(new Widget1); |
|||
|
|||
QWidget* w = new QWidget(this); |
|||
w->setLayout(layout); |
|||
|
|||
setCentralWidget(w); |
|||
} |
|||
|
|||
MainWindow::~MainWindow() |
|||
{ |
|||
delete ui; |
|||
} |
|||
@ -1,22 +0,0 @@ |
|||
#ifndef MAINWINDOW_H |
|||
#define MAINWINDOW_H |
|||
|
|||
#include <QMainWindow> |
|||
|
|||
QT_BEGIN_NAMESPACE |
|||
namespace Ui { |
|||
class MainWindow; |
|||
} |
|||
QT_END_NAMESPACE |
|||
|
|||
class MainWindow : public QMainWindow |
|||
{ |
|||
Q_OBJECT |
|||
public: |
|||
MainWindow(QWidget* parent = nullptr); |
|||
~MainWindow(); |
|||
|
|||
private: |
|||
Ui::MainWindow* ui; |
|||
}; |
|||
#endif // MAINWINDOW_H |
|||
@ -1,33 +0,0 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<ui version="4.0"> |
|||
<class>MainWindow</class> |
|||
<widget class="QMainWindow" name="MainWindow"> |
|||
<property name="geometry"> |
|||
<rect> |
|||
<x>0</x> |
|||
<y>0</y> |
|||
<width>800</width> |
|||
<height>600</height> |
|||
</rect> |
|||
</property> |
|||
<property name="windowTitle"> |
|||
<string>MainWindow</string> |
|||
</property> |
|||
<widget class="QWidget" name="centralwidget"> |
|||
<layout class="QGridLayout" name="gridLayout"/> |
|||
</widget> |
|||
<widget class="QMenuBar" name="menubar"> |
|||
<property name="geometry"> |
|||
<rect> |
|||
<x>0</x> |
|||
<y>0</y> |
|||
<width>800</width> |
|||
<height>22</height> |
|||
</rect> |
|||
</property> |
|||
</widget> |
|||
<widget class="QStatusBar" name="statusbar"/> |
|||
</widget> |
|||
<resources/> |
|||
<connections/> |
|||
</ui> |
|||
@ -1,22 +0,0 @@ |
|||
#include "widget1.h"
|
|||
|
|||
#include "src/ui_widget1.h"
|
|||
|
|||
Widget1::Widget1(QWidget* parent) |
|||
: QWidget(parent) |
|||
, ui(new Ui::Widget1) |
|||
{ |
|||
ui->setupUi(this); |
|||
connect(ui->lineEdit, SIGNAL(textChanged(const QString&)), this, |
|||
SLOT(onTextChanged(const QString&))); |
|||
} |
|||
|
|||
Widget1::~Widget1() |
|||
{ |
|||
delete ui; |
|||
} |
|||
|
|||
void Widget1::onTextChanged(const QString& text) |
|||
{ |
|||
ui->OnTextChanged->setText(text); |
|||
} |
|||
@ -1,23 +0,0 @@ |
|||
#ifndef WIDGET1_H |
|||
#define WIDGET1_H |
|||
|
|||
#include <QWidget> |
|||
|
|||
namespace Ui { |
|||
class Widget1; |
|||
} |
|||
|
|||
class Widget1 : public QWidget |
|||
{ |
|||
Q_OBJECT |
|||
public: |
|||
explicit Widget1(QWidget* parent = nullptr); |
|||
~Widget1(); |
|||
public slots: |
|||
void onTextChanged(const QString& text); |
|||
|
|||
private: |
|||
Ui::Widget1* ui; |
|||
}; |
|||
|
|||
#endif // WIDGET1_H |
|||
@ -1,52 +0,0 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<ui version="4.0"> |
|||
<class>Widget1</class> |
|||
<widget class="QWidget" name="Widget1"> |
|||
<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="QFormLayout" name="formLayout"> |
|||
<item row="0" column="0"> |
|||
<widget class="QLabel" name="label_3"> |
|||
<property name="text"> |
|||
<string>Input:</string> |
|||
</property> |
|||
</widget> |
|||
</item> |
|||
<item row="0" column="1"> |
|||
<widget class="QLineEdit" name="lineEdit"/> |
|||
</item> |
|||
<item row="1" column="0"> |
|||
<widget class="QLabel" name="label"> |
|||
<property name="text"> |
|||
<string>OnTextChanged:</string> |
|||
</property> |
|||
</widget> |
|||
</item> |
|||
<item row="1" column="1"> |
|||
<widget class="QLabel" name="OnTextChanged"> |
|||
<property name="text"> |
|||
<string/> |
|||
</property> |
|||
</widget> |
|||
</item> |
|||
<item row="2" column="0"> |
|||
<widget class="QLabel" name="label_2"> |
|||
<property name="text"> |
|||
<string>TextLabel</string> |
|||
</property> |
|||
</widget> |
|||
</item> |
|||
</layout> |
|||
</widget> |
|||
<resources/> |
|||
<connections/> |
|||
</ui> |
|||
@ -1,22 +0,0 @@ |
|||
#include "widget2.h"
|
|||
|
|||
#include "src/ui_widget2.h"
|
|||
|
|||
Widget2::Widget2(QWidget* parent) |
|||
: QWidget(parent) |
|||
, ui(new Ui::Widget2) |
|||
{ |
|||
ui->setupUi(this); |
|||
connect(ui->lineEdit, SIGNAL(textChanged(const QString&)), this, |
|||
SLOT(onTextChanged(const QString&))); |
|||
} |
|||
|
|||
Widget2::~Widget2() |
|||
{ |
|||
delete ui; |
|||
} |
|||
|
|||
void Widget2::onTextChanged(const QString& text) |
|||
{ |
|||
ui->OnTextChanged->setText(text); |
|||
} |
|||
@ -1,24 +0,0 @@ |
|||
#ifndef WIDGET2_H |
|||
#define WIDGET2_H |
|||
|
|||
#include <QWidget> |
|||
|
|||
namespace Ui { |
|||
class Widget2; |
|||
} |
|||
|
|||
class Widget2 : public QWidget |
|||
{ |
|||
Q_OBJECT |
|||
|
|||
public: |
|||
explicit Widget2(QWidget* parent = nullptr); |
|||
~Widget2(); |
|||
public slots: |
|||
void onTextChanged(const QString& text); |
|||
|
|||
private: |
|||
Ui::Widget2* ui; |
|||
}; |
|||
|
|||
#endif // WIDGET2_H |
|||
@ -1,45 +0,0 @@ |
|||
<?xml version="1.0" encoding="UTF-8"?> |
|||
<ui version="4.0"> |
|||
<class>Widget2</class> |
|||
<widget class="QWidget" name="Widget2"> |
|||
<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="QFormLayout" name="formLayout"> |
|||
<item row="0" column="0"> |
|||
<widget class="QLabel" name="label_3"> |
|||
<property name="text"> |
|||
<string>Input:</string> |
|||
</property> |
|||
</widget> |
|||
</item> |
|||
<item row="0" column="1"> |
|||
<widget class="QLineEdit" name="lineEdit"/> |
|||
</item> |
|||
<item row="1" column="0"> |
|||
<widget class="QLabel" name="label"> |
|||
<property name="text"> |
|||
<string>OnTextChanged:</string> |
|||
</property> |
|||
</widget> |
|||
</item> |
|||
<item row="1" column="1"> |
|||
<widget class="QLabel" name="OnTextChanged"> |
|||
<property name="text"> |
|||
<string/> |
|||
</property> |
|||
</widget> |
|||
</item> |
|||
</layout> |
|||
</widget> |
|||
<resources/> |
|||
<connections/> |
|||
</ui> |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue