[neon/qt6/qt6-tools/Neon/release] debian/not_patches_to_make_linters_smile/patches: add upstream patch to try and fix untiy build
Carlos De Maine
null at kde.org
Fri Mar 29 00:05:21 GMT 2024
Git commit 61cc1d611c0e9a1fe29728702a25eda6532c3a12 by Carlos De Maine.
Committed on 29/03/2024 at 00:05.
Pushed by carlosdem into branch 'Neon/release'.
add upstream patch to try and fix untiy build
A +130 -0 debian/not_patches_to_make_linters_smile/patches/fix_unity_build_QTBUG-120751
A +1 -0 debian/not_patches_to_make_linters_smile/patches/series
https://invent.kde.org/neon/qt6/qt6-tools/-/commit/61cc1d611c0e9a1fe29728702a25eda6532c3a12
diff --git a/debian/not_patches_to_make_linters_smile/patches/fix_unity_build_QTBUG-120751 b/debian/not_patches_to_make_linters_smile/patches/fix_unity_build_QTBUG-120751
new file mode 100644
index 0000000..e0b48b9
--- /dev/null
+++ b/debian/not_patches_to_make_linters_smile/patches/fix_unity_build_QTBUG-120751
@@ -0,0 +1,130 @@
+diff --git a/src/designer/src/components/formeditor/deviceprofiledialog.cpp b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
+index 6deabba..188e24c 100644 (file)
+--- a/src/designer/src/components/formeditor/deviceprofiledialog.cpp
++++ b/src/designer/src/components/formeditor/deviceprofiledialog.cpp
+@@ -44,7 +44,7 @@ namespace qdesigner_internal {
+
+ DeviceProfileDialog::DeviceProfileDialog(QDesignerDialogGuiInterface *dlgGui, QWidget *parent) :
+ QDialog(parent),
+- m_ui(new Ui::DeviceProfileDialog),
++ m_ui(new QT_PREPEND_NAMESPACE(Ui)::DeviceProfileDialog),
+ m_dlgGui(dlgGui)
+ {
+ setModal(true);
+diff --git a/src/designer/src/components/formeditor/formwindowsettings.cpp b/src/designer/src/components/formeditor/formwindowsettings.cpp
+index df3fa01..ad0e32f 100644 (file)
+--- a/src/designer/src/components/formeditor/formwindowsettings.cpp
++++ b/src/designer/src/components/formeditor/formwindowsettings.cpp
+@@ -143,7 +143,7 @@ void FormWindowData::applyToFormWindow(FormWindowBase* fw) const
+
+ FormWindowSettings::FormWindowSettings(QDesignerFormWindowInterface *parent) :
+ QDialog(parent),
+- m_ui(new ::Ui::FormWindowSettings),
++ m_ui(new QT_PREPEND_NAMESPACE(Ui)::FormWindowSettings),
+ m_formWindow(qobject_cast<FormWindowBase*>(parent)),
+ m_oldData(new FormWindowData)
+ {
+diff --git a/src/designer/src/components/formeditor/templateoptionspage.cpp b/src/designer/src/components/formeditor/templateoptionspage.cpp
+index b549812..2063972 100644 (file)
+--- a/src/designer/src/components/formeditor/templateoptionspage.cpp
++++ b/src/designer/src/components/formeditor/templateoptionspage.cpp
+@@ -20,7 +20,7 @@ namespace qdesigner_internal {
+ TemplateOptionsWidget::TemplateOptionsWidget(QDesignerFormEditorInterface *core, QWidget *parent) :
+ QWidget(parent),
+ m_core(core),
+- m_ui(new Ui::TemplateOptionsWidget)
++ m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::TemplateOptionsWidget)
+ {
+ m_ui->setupUi(this);
+
+diff --git a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
+index 6ac1638..a8972c3 100644 (file)
+--- a/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
++++ b/src/designer/src/components/propertyeditor/newdynamicpropertydialog.cpp
+@@ -18,7 +18,7 @@ NewDynamicPropertyDialog::NewDynamicPropertyDialog(QDesignerDialogGuiInterface *
+ QWidget *parent) :
+ QDialog(parent),
+ m_dialogGui(dialogGui),
+- m_ui(new Ui::NewDynamicPropertyDialog)
++ m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::NewDynamicPropertyDialog)
+ {
+ m_ui->setupUi(this);
+ connect(m_ui->m_lineEdit, &QLineEdit::textChanged, this, &NewDynamicPropertyDialog::nameChanged);
+diff --git a/src/designer/src/designer/preferencesdialog.cpp b/src/designer/src/designer/preferencesdialog.cpp
+index 6c597c6..eac6e82 100644 (file)
+--- a/src/designer/src/designer/preferencesdialog.cpp
++++ b/src/designer/src/designer/preferencesdialog.cpp
+@@ -15,7 +15,7 @@ QT_BEGIN_NAMESPACE
+
+ PreferencesDialog::PreferencesDialog(QDesignerFormEditorInterface *core, QWidget *parentWidget) :
+ QDialog(parentWidget),
+- m_ui(new Ui::PreferencesDialog()),
++ m_ui(new QT_PREPEND_NAMESPACE(Ui)::PreferencesDialog()),
+ m_core(core)
+ {
+ m_ui->setupUi(this);
+diff --git a/src/designer/src/designer/qdesigner_appearanceoptions.cpp b/src/designer/src/designer/qdesigner_appearanceoptions.cpp
+index 4c68a44..a4e0621 100644 (file)
+--- a/src/designer/src/designer/qdesigner_appearanceoptions.cpp
++++ b/src/designer/src/designer/qdesigner_appearanceoptions.cpp
+@@ -29,7 +29,7 @@ void AppearanceOptions::fromSettings(const QDesignerSettings &settings)
+ // ---------------- QDesignerAppearanceOptionsWidget
+ QDesignerAppearanceOptionsWidget::QDesignerAppearanceOptionsWidget(QWidget *parent) :
+ QWidget(parent),
+- m_ui(new Ui::AppearanceOptionsWidget)
++ m_ui(new QT_PREPEND_NAMESPACE(Ui)::AppearanceOptionsWidget)
+ {
+ m_ui->setupUi(this);
+
+diff --git a/src/designer/src/lib/shared/gridpanel.cpp b/src/designer/src/lib/shared/gridpanel.cpp
+index 645c799..a5f6ae6 100644 (file)
+--- a/src/designer/src/lib/shared/gridpanel.cpp
++++ b/src/designer/src/lib/shared/gridpanel.cpp
+@@ -12,7 +12,7 @@ namespace qdesigner_internal {
+ GridPanel::GridPanel(QWidget *parentWidget) :
+ QWidget(parentWidget)
+ {
+- m_ui = new Ui::GridPanel;
++ m_ui = new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::GridPanel;
+ m_ui->setupUi(this);
+
+ connect(m_ui->m_resetButton, &QAbstractButton::clicked, this, &GridPanel::reset);
+diff --git a/src/designer/src/lib/shared/newactiondialog.cpp b/src/designer/src/lib/shared/newactiondialog.cpp
+index 7c27e3a..598549e 100644 (file)
+--- a/src/designer/src/lib/shared/newactiondialog.cpp
++++ b/src/designer/src/lib/shared/newactiondialog.cpp
+@@ -44,7 +44,7 @@ unsigned ActionData::compare(const ActionData &rhs) const
+ // -------------------- NewActionDialog
+ NewActionDialog::NewActionDialog(ActionEditor *parent) :
+ QDialog(parent, Qt::Sheet),
+- m_ui(new Ui::NewActionDialog),
++ m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::NewActionDialog),
+ m_actionEditor(parent),
+ m_autoUpdateObjectName(true)
+ {
+diff --git a/src/designer/src/lib/shared/newformwidget.cpp b/src/designer/src/lib/shared/newformwidget.cpp
+index 1cf1c8b..383b3fc 100644 (file)
+--- a/src/designer/src/lib/shared/newformwidget.cpp
++++ b/src/designer/src/lib/shared/newformwidget.cpp
+@@ -102,7 +102,7 @@ static const struct TemplateSize templateSizes[] =
+ NewFormWidget::NewFormWidget(QDesignerFormEditorInterface *core, QWidget *parentWidget) :
+ QDesignerNewFormWidgetInterface(parentWidget),
+ m_core(core),
+- m_ui(new Ui::NewFormWidget),
++ m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::NewFormWidget),
+ m_currentItem(nullptr),
+ m_acceptedItem(nullptr)
+ {
+diff --git a/src/designer/src/lib/shared/orderdialog.cpp b/src/designer/src/lib/shared/orderdialog.cpp
+index be94b51..faa1350 100644 (file)
+--- a/src/designer/src/lib/shared/orderdialog.cpp
++++ b/src/designer/src/lib/shared/orderdialog.cpp
+@@ -21,7 +21,7 @@ namespace qdesigner_internal {
+
+ OrderDialog::OrderDialog(QWidget *parent) :
+ QDialog(parent),
+- m_ui(new Ui::OrderDialog),
++ m_ui(new QT_PREPEND_NAMESPACE(qdesigner_internal)::Ui::OrderDialog),
+ m_format(PageOrderFormat)
+ {
+ m_ui->setupUi(this);
diff --git a/debian/not_patches_to_make_linters_smile/patches/series b/debian/not_patches_to_make_linters_smile/patches/series
new file mode 100644
index 0000000..b7f10cc
--- /dev/null
+++ b/debian/not_patches_to_make_linters_smile/patches/series
@@ -0,0 +1 @@
+fix_unity_build_QTBUG-120751
\ No newline at end of file
More information about the Neon-commits
mailing list