forked from qt-creator/qt-creator
Drop Qt5: Remove porting.h
Checked also plugins in tqtc-qtc-super and in qtc-super. Change-Id: I3e5b114a49e26ae52b71c11ef6a1f90264dd5a38 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
@@ -116,7 +116,6 @@ add_qtc_library(Utils
|
|||||||
persistentsettings.cpp persistentsettings.h
|
persistentsettings.cpp persistentsettings.h
|
||||||
pointeralgorithm.h
|
pointeralgorithm.h
|
||||||
port.cpp port.h
|
port.cpp port.h
|
||||||
porting.h
|
|
||||||
portlist.cpp portlist.h
|
portlist.cpp portlist.h
|
||||||
predicates.h
|
predicates.h
|
||||||
processenums.h
|
processenums.h
|
||||||
|
@@ -1,51 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2020 The Qt Company Ltd.
|
|
||||||
** Contact: https://www.qt.io/licensing/
|
|
||||||
**
|
|
||||||
** This file is part of Qt Creator.
|
|
||||||
**
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and The Qt Company. For licensing terms
|
|
||||||
** and conditions see https://www.qt.io/terms-conditions. For further
|
|
||||||
** information use the contact form at https://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** GNU General Public License Usage
|
|
||||||
** Alternatively, this file may be used under the terms of the GNU
|
|
||||||
** General Public License version 3 as published by the Free Software
|
|
||||||
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
|
|
||||||
** included in the packaging of this file. Please review the following
|
|
||||||
** information to ensure the GNU General Public License requirements will
|
|
||||||
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include "utils_global.h"
|
|
||||||
|
|
||||||
#include <QString>
|
|
||||||
|
|
||||||
namespace Utils {
|
|
||||||
|
|
||||||
// FIXME: Remove when downstream has been adapted
|
|
||||||
|
|
||||||
using QHashValueType = size_t;
|
|
||||||
using QtSizeType = qsizetype;
|
|
||||||
using StringView = QStringView;
|
|
||||||
|
|
||||||
inline QStringView make_stringview(const QString &s)
|
|
||||||
{
|
|
||||||
return QStringView(s);
|
|
||||||
}
|
|
||||||
|
|
||||||
// QStringView::mid in Qt5 does not do bounds checking, in Qt6 it does
|
|
||||||
inline QStringView midView(const QString &s, int offset, int length = -1)
|
|
||||||
{
|
|
||||||
return QStringView(s).mid(offset, length);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace Utils
|
|
@@ -222,7 +222,6 @@ Project {
|
|||||||
"pointeralgorithm.h",
|
"pointeralgorithm.h",
|
||||||
"port.cpp",
|
"port.cpp",
|
||||||
"port.h",
|
"port.h",
|
||||||
"porting.h",
|
|
||||||
"portlist.cpp",
|
"portlist.cpp",
|
||||||
"portlist.h",
|
"portlist.h",
|
||||||
"processenums.h",
|
"processenums.h",
|
||||||
|
@@ -77,7 +77,6 @@ extend_qtc_library(sdktoolLib
|
|||||||
namevaluedictionary.cpp namevaluedictionary.h
|
namevaluedictionary.cpp namevaluedictionary.h
|
||||||
namevalueitem.cpp namevalueitem.h
|
namevalueitem.cpp namevalueitem.h
|
||||||
persistentsettings.cpp persistentsettings.h
|
persistentsettings.cpp persistentsettings.h
|
||||||
porting.h
|
|
||||||
qtcassert.cpp qtcassert.h
|
qtcassert.cpp qtcassert.h
|
||||||
savefile.cpp savefile.h
|
savefile.cpp savefile.h
|
||||||
stringutils.cpp stringutils.h
|
stringutils.cpp stringutils.h
|
||||||
|
@@ -96,7 +96,6 @@ QtcLibrary {
|
|||||||
"namevaluedictionary.cpp", "namevaluedictionary.h",
|
"namevaluedictionary.cpp", "namevaluedictionary.h",
|
||||||
"namevalueitem.cpp", "namevalueitem.h",
|
"namevalueitem.cpp", "namevalueitem.h",
|
||||||
"persistentsettings.cpp", "persistentsettings.h",
|
"persistentsettings.cpp", "persistentsettings.h",
|
||||||
"porting.h",
|
|
||||||
"qtcassert.cpp", "qtcassert.h",
|
"qtcassert.cpp", "qtcassert.h",
|
||||||
"savefile.cpp", "savefile.h",
|
"savefile.cpp", "savefile.h",
|
||||||
"stringutils.cpp"
|
"stringutils.cpp"
|
||||||
|
@@ -32,11 +32,6 @@ extend_qtc_test(tst_manual_proparser
|
|||||||
registry.cpp registry_p.h
|
registry.cpp registry_p.h
|
||||||
)
|
)
|
||||||
|
|
||||||
extend_qtc_test(tst_manual_proparser
|
|
||||||
SOURCES_PREFIX "${PROJECT_SOURCE_DIR}/src/libs/utils/"
|
|
||||||
SOURCES porting.h
|
|
||||||
)
|
|
||||||
|
|
||||||
extend_qtc_test(tst_manual_proparser CONDITION WIN32
|
extend_qtc_test(tst_manual_proparser CONDITION WIN32
|
||||||
DEPENDS advapi32
|
DEPENDS advapi32
|
||||||
)
|
)
|
||||||
|
@@ -53,9 +53,5 @@ QtcManualtest {
|
|||||||
Group {
|
Group {
|
||||||
name: "Porting Helper"
|
name: "Porting Helper"
|
||||||
prefix: "../../../src/libs/utils/"
|
prefix: "../../../src/libs/utils/"
|
||||||
|
|
||||||
files: [
|
|
||||||
"porting.h"
|
|
||||||
]
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user