From e6eb061293a63bf52fb34dc39016d0fa8bbbe12b Mon Sep 17 00:00:00 2001
From: Fawzi Mohamed <fawzi.mohamed@digia.com>
Date: Thu, 11 Apr 2013 17:56:54 +0200
Subject: [PATCH] cpp/fileandtokenactions: fix qt4 compilation
Change-Id: Ic55e5e79c5707aa8e19be32f282d679e4e9be627
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
---
src/plugins/cppeditor/fileandtokenactions_test.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/plugins/cppeditor/fileandtokenactions_test.cpp b/src/plugins/cppeditor/fileandtokenactions_test.cpp
index 87adf7dceb0..0877dc092ef 100644
--- a/src/plugins/cppeditor/fileandtokenactions_test.cpp
+++ b/src/plugins/cppeditor/fileandtokenactions_test.cpp
@@ -47,6 +47,11 @@
#include <QTextDocument>
#include <QtTest>
+#if QT_VERSION >= 0x050000
+#define MSKIP_SINGLE(x) QSKIP(x)
+#else
+#define MSKIP_SINGLE(x) QSKIP(x, SkipSingle)
+#endif
/*!
Tests for executing "test actions" for
@@ -125,7 +130,7 @@ void TestActionsTestCase::run(const Actions &tokenActions, const Actions &fileAc
QStringList filesToOpen;
const QList<CppModelManagerInterface::ProjectInfo> projectInfos = mm->projectInfos();
if (projectInfos.isEmpty())
- QSKIP("No project(s) loaded. Test operates only on loaded projects.");
+ MSKIP_SINGLE("No project(s) loaded. Test operates only on loaded projects.");
foreach (const CppModelManagerInterface::ProjectInfo &info, projectInfos) {
qDebug() << "Project" << info.project()->displayName() << "- files to process:"
--
GitLab