From 6896ca3a26cbd00f9e90a57c6b197143617a6e70 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 18 Jun 2020 15:38:28 +0200
Subject: Utils: Introduce a central porting.h for "simple porting stuff"

I figured it might be easier to keep track of active hack here and
also recognized includes that only exist for that reasons in user code
if it's always the same.

Change-Id: I4bf6af493443148cf30a6903d541cd9dc58946da
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/libs/qmldebug/qmldebugconnection.cpp |  1 +
 src/libs/utils/CMakeLists.txt            |  1 +
 src/libs/utils/porting.h                 | 40 ++++++++++++++++++++++++++++++++
 src/libs/utils/stringutils.h             |  8 ++-----
 src/libs/utils/utils-lib.pri             |  3 ++-
 src/libs/utils/utils.qbs                 |  1 +
 6 files changed, 47 insertions(+), 7 deletions(-)
 create mode 100644 src/libs/utils/porting.h

(limited to 'src/libs')

diff --git a/src/libs/qmldebug/qmldebugconnection.cpp b/src/libs/qmldebug/qmldebugconnection.cpp
index 50736b6468..cb31557d10 100644
--- a/src/libs/qmldebug/qmldebugconnection.cpp
+++ b/src/libs/qmldebug/qmldebugconnection.cpp
@@ -27,6 +27,7 @@
 #include "qmldebugclient.h"
 #include "qpacketprotocol.h"
 
+#include <utils/porting.h>
 #include <utils/temporaryfile.h>
 
 #include <QLocalServer>
diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt
index 79ee29eb5f..ed95032dd2 100644
--- a/src/libs/utils/CMakeLists.txt
+++ b/src/libs/utils/CMakeLists.txt
@@ -108,6 +108,7 @@ add_qtc_library(Utils
     persistentsettings.cpp persistentsettings.h
     pointeralgorithm.h
     port.cpp port.h
+    porting.h
     portlist.cpp portlist.h
     predicates.h
     processhandle.cpp processhandle.h
diff --git a/src/libs/utils/porting.h b/src/libs/utils/porting.h
new file mode 100644
index 0000000000..a83631617c
--- /dev/null
+++ b/src/libs/utils/porting.h
@@ -0,0 +1,40 @@
+/****************************************************************************
+**
+** 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 {
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
+constexpr QString::SplitBehavior SkipEmptyParts = QString::SkipEmptyParts;
+#else
+constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts;
+#endif
+
+} // namespace Utils
diff --git a/src/libs/utils/stringutils.h b/src/libs/utils/stringutils.h
index f3cce3446f..21a01de359 100644
--- a/src/libs/utils/stringutils.h
+++ b/src/libs/utils/stringutils.h
@@ -27,6 +27,8 @@
 
 #include "utils_global.h"
 
+#include "porting.h"
+
 #include <QList>
 #include <QString>
 
@@ -36,12 +38,6 @@ QT_END_NAMESPACE
 
 namespace Utils {
 
-#if (QT_VERSION < QT_VERSION_CHECK(5, 14, 0))
-constexpr QString::SplitBehavior SkipEmptyParts = QString::SkipEmptyParts;
-#else
-constexpr Qt::SplitBehaviorFlags SkipEmptyParts = Qt::SkipEmptyParts;
-#endif
-
 // Create a usable settings key from a category,
 // for example Editor|C++ -> Editor_C__
 QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category);
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index d733055e67..a8c509c98b 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -289,7 +289,8 @@ HEADERS += \
     $$PWD/overlaywidget.h \
     $$PWD/archive.h \
     $$PWD/id.h \
-    $$PWD/infobar.h
+    $$PWD/infobar.h \
+    $$PWD/porting.h
 
 FORMS += $$PWD/filewizardpage.ui \
     $$PWD/projectintropage.ui \
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index deb29327fb..de63088888 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -198,6 +198,7 @@ Project {
             "pointeralgorithm.h",
             "port.cpp",
             "port.h",
+            "porting.h",
             "portlist.cpp",
             "portlist.h",
             "processhandle.cpp",
-- 
cgit v1.2.3