[neon/qt6/qt6-tools/Neon/release] debian/patches: try adding another upstream patch
Carlos De Maine
null at kde.org
Fri Mar 29 03:49:17 GMT 2024
Git commit a267697bff9e5bca6fa6e77a95ed6459ff2e98d1 by Carlos De Maine.
Committed on 29/03/2024 at 03:49.
Pushed by carlosdem into branch 'Neon/release'.
try adding another upstream patch
M +13 -130 debian/patches/fix_unity_build_QTBUG-120751
C +0 -0 debian/patches/fix_unity_build_qt-tools-540480 [from: debian/patches/fix_unity_build_QTBUG-120751 - 100% similarity]
https://invent.kde.org/neon/qt6/qt6-tools/-/commit/a267697bff9e5bca6fa6e77a95ed6459ff2e98d1
diff --git a/debian/patches/fix_unity_build_QTBUG-120751 b/debian/patches/fix_unity_build_QTBUG-120751
index e0b48b9..4d0f696 100644
--- a/debian/patches/fix_unity_build_QTBUG-120751
+++ b/debian/patches/fix_unity_build_QTBUG-120751
@@ -1,130 +1,13 @@
-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/src/designer/src/components/lib/CMakeLists.txt b/src/designer/src/components/lib/CMakeLists.txt
+index 6fe4d73da..8697e9f0e 100644
+--- a/src/designer/src/components/lib/CMakeLists.txt
++++ b/src/designer/src/components/lib/CMakeLists.txt
+@@ -96,6 +96,8 @@ qt_internal_add_module(DesignerComponentsPrivate
+ qdesigner_components.cpp
+ NO_UNITY_BUILD_SOURCES
+ ../tabordereditor/tabordereditor.cpp # redefinition of 'QMetaTypeId<QList<QWidget *>>' (from qdesigner_resource.cpp)
++ ../formeditor/deviceprofiledialog.cpp
++ ../formeditor/formwindow.cpp
+ DEFINES
+ QDESIGNER_COMPONENTS_LIBRARY
+ QT_STATICPLUGIN
\ No newline at end of file
diff --git a/debian/patches/fix_unity_build_QTBUG-120751 b/debian/patches/fix_unity_build_qt-tools-540480
similarity index 100%
copy from debian/patches/fix_unity_build_QTBUG-120751
copy to debian/patches/fix_unity_build_qt-tools-540480
More information about the Neon-commits
mailing list