From 1d50f02494b3929f0729562e995c87ba8a8d7866 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Tue, 9 Jun 2009 13:50:37 +0200
Subject: [PATCH] Remove Q_DISABLE_COPY from generated classes. QObject already
defines it.
Revieved-By: dt
---
src/plugins/designer/cpp/formclasswizardparameters.cpp | 1 -
src/plugins/qt4projectmanager/wizards/libraryparameters.cpp | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/plugins/designer/cpp/formclasswizardparameters.cpp b/src/plugins/designer/cpp/formclasswizardparameters.cpp
index c21dbb2b7c4..0132f85bd24 100644
--- a/src/plugins/designer/cpp/formclasswizardparameters.cpp
+++ b/src/plugins/designer/cpp/formclasswizardparameters.cpp
@@ -114,7 +114,6 @@ bool FormClassWizardParameters::generateCpp(QString *header, QString *source, in
headerStr << ", private " << uiClassName;
}
headerStr << " {\n" << namespaceIndent << indent << "Q_OBJECT\n"
- << namespaceIndent << indent << "Q_DISABLE_COPY(" << unqualifiedClassName << ")\n"
<< namespaceIndent << "public:\n"
<< namespaceIndent << indent << "explicit " << unqualifiedClassName << "(QWidget *parent = 0);\n";
if (embedding == PointerAggregatedUiClass)
diff --git a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
index 05d6fa83b53..a0ad471643a 100644
--- a/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
+++ b/src/plugins/qt4projectmanager/wizards/libraryparameters.cpp
@@ -113,8 +113,7 @@ void LibraryParameters::generateCode(QtProjectParameters:: Type t,
// Is this a QObject (plugin)
const bool inheritsQObject = t == QtProjectParameters::Qt4Plugin;
if (inheritsQObject) {
- headerStr << namespaceIndent << indent << "Q_OBJECT\n"
- << namespaceIndent << indent << "Q_DISABLE_COPY(" << unqualifiedClassName << ")\n";
+ headerStr << namespaceIndent << indent << "Q_OBJECT\n";
}
headerStr << namespaceIndent << "public:\n";
if (inheritsQObject) {
--
GitLab