From 224b22e8c923e14420fd176bdc09e2d17d65f7c7 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Wed, 18 Mar 2015 08:42:17 +0100
Subject: [PATCH] Remove macro DEBUG_CODE from Test SDK.
It was used to disable code/variables referenced in Q_ASSERT_X.
Since the macro is now expanded in release mode as well, this
causes compilation errors.
Change-Id: I5b90515c042f9d3e76be84cd5385eae081a037c8
Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
---
tests/auto/xmlpatternssdk/XMLWriter.cpp | 16 +++++-----------
1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/tests/auto/xmlpatternssdk/XMLWriter.cpp b/tests/auto/xmlpatternssdk/XMLWriter.cpp
index 635f6938..71ef022f 100644
--- a/tests/auto/xmlpatternssdk/XMLWriter.cpp
+++ b/tests/auto/xmlpatternssdk/XMLWriter.cpp
@@ -76,12 +76,6 @@ using namespace QPatternistSDK;
typedef QPair<QString, QString> NSBinding;
typedef QList<NSBinding> NSBindingList;
-#ifdef QT_NO_DEBUG
-# define DEBUG_CODE(code)
-#else
-# define DEBUG_CODE(code) code
-#endif
-
class XMLWriter::Private
{
public:
@@ -290,8 +284,8 @@ public:
QIODevice *dev;
QStack<bool> hasContentStack;
QString errorString;
- DEBUG_CODE(QStack<QString> tags;)
- DEBUG_CODE(QStack<NSBindingList> namespaceTracker;)
+ QStack<QString> tags;
+ QStack<NSBindingList> namespaceTracker;
};
/**
@@ -364,8 +358,8 @@ bool XMLWriter::startElement(const QString &qName,
serialize('<');
serialize(qName);
- DEBUG_CODE(d->tags.push(qName));
- DEBUG_CODE(d->namespaceTracker.push(d->namespaces));
+ d->tags.push(qName);
+ d->namespaceTracker.push(d->namespaces);
/* Add namespace declarations. */
const NSBindingList::const_iterator end(d->namespaces.constEnd());
@@ -421,7 +415,7 @@ bool XMLWriter::endElement(const QString &qName)
Q_ASSERT_X(d->tags.pop() == qName, Q_FUNC_INFO,
"The element tags are not balanced, the produced XML is invalid.");
- DEBUG_CODE(d->namespaceTracker.pop());
+ d->namespaceTracker.pop();
/* "this" element is content for our parent, so ensure hasElementContent is true. */
--
GitLab