Commit eedd4765 authored by Nikolai Kosjar's avatar Nikolai Kosjar

Cpp{Editor,Tools}: Remove some Qt4-only code

Change-Id: I94ca7b239e974b6b400933466ee2ef5ae4def336
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 42038ca3
......@@ -53,13 +53,6 @@
#include <QTextDocument>
#include <QtTest>
#if QT_VERSION >= 0x050000
#define MSKIP_SINGLE(x) QSKIP(x)
#else
#include <QtTest/qtestkeyboard.h>
#define MSKIP_SINGLE(x) QSKIP(x, SkipSingle)
#endif
/*!
Tests for executing "test actions" for
(1) each file of each loaded project (file actions) or
......@@ -154,7 +147,7 @@ TestActionsTestCase::TestActionsTestCase(const Actions &tokenActions, const Acti
const QList<ProjectInfo> projectInfos
= m_modelManager->projectInfos();
if (projectInfos.isEmpty())
MSKIP_SINGLE("No project(s) loaded. Test operates only on loaded projects.");
QSKIP("No project(s) loaded. Test operates only on loaded projects.");
foreach (const ProjectInfo &info, projectInfos) {
QPointer<ProjectExplorer::Project> project = info.project();
......
......@@ -35,11 +35,8 @@
#include "cppworkingcopy.h"
#include <cplusplus/Icons.h>
#include <cplusplus/Symbol.h>
#include <cplusplus/TypeOfExpression.h>
#if QT_VERSION >= 0x050000
// Qt 5 requires the types to be defined for Q_DECLARE_METATYPE
# include <cplusplus/Symbol.h>
#endif
#include <texteditor/basetexteditor.h>
#include <texteditor/codeassist/basicproposalitemlistmodel.h>
......
......@@ -46,12 +46,6 @@
#include <QFileInfo>
#include <QtTest>
#if QT_VERSION >= 0x050000
#define MSKIP_SINGLE(x) QSKIP(x)
#else
#define MSKIP_SINGLE(x) QSKIP(x, SkipSingle)
#endif
using namespace CppTools::Internal;
using namespace ProjectExplorer;
......@@ -247,7 +241,7 @@ void CppToolsPlugin::test_modelmanager_paths_are_clean()
void CppToolsPlugin::test_modelmanager_framework_headers()
{
if (Utils::HostOsInfo::isWindowsHost())
MSKIP_SINGLE("Can't resolve framework soft links on Windows.");
QSKIP("Can't resolve framework soft links on Windows.");
ModelManagerTestHelper helper;
CppModelManager *mm = CppModelManager::instance();
......
......@@ -60,7 +60,7 @@ QString StringTable::insert(const QString &string)
if (string.isEmpty())
return string;
#if QT_VERSION >= 0x050000 && QT_SUPPORTS(UNSHARABLE_CONTAINERS)
#if QT_SUPPORTS(UNSHARABLE_CONTAINERS)
QTC_ASSERT(const_cast<QString&>(string).data_ptr()->ref.isSharable(), return string);
#endif
......@@ -90,12 +90,8 @@ enum {
static inline bool isQStringInUse(const QString &string)
{
#if QT_VERSION >= 0x050000
QArrayData *data_ptr = const_cast<QString&>(string).data_ptr();
return data_ptr->ref.isShared() || data_ptr->ref.isStatic();
#else
return const_cast<QString&>(string).data_ptr()->ref != 1;
#endif
}
void StringTable::GC()
......
......@@ -27,21 +27,13 @@
**
****************************************************************************/
#include <QDebug>
#include <QDir>
#include <QGuiApplication>
#include <QStringList>
#include <QTextDocument>
#include <QTextCursor>
#include <QTextBlock>
#include <QDir>
#include <QDebug>
#if QT_VERSION >= 0x050000
// Qt5: QTextDocument needs access to Fonts via QGuiApplication.
#include <QGuiApplication>
typedef QGuiApplication MyQApplication;
#else
#include <QCoreApplication>
typedef QCoreApplication MyQApplication;
#endif
#include <QTextCursor>
#include <QTextDocument>
#include <cplusplus/Control.h>
#include <cplusplus/Parser.h>
......@@ -1720,7 +1712,7 @@ void printUsage()
int main(int argc, char *argv[])
{
MyQApplication app(argc, argv);
QGuiApplication app(argc, argv);
QStringList args = app.arguments();
args.removeFirst();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment