feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

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

Browse Source 
Change-Id: I94ca7b239e974b6b400933466ee2ef5ae4def336
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Nikolai Kosjar
2014-08-28 17:44:24 +02:00
parent 42038ca35a
commit eedd47657f
5 changed files with 11 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/cpptools/cppcompletionassist.h
View File

@@ -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>

8
src/plugins/cpptools/cppmodelmanager_test.cpp
View File

@@ -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();

6
src/plugins/cpptools/stringtable.cpp
View File

@@ -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()