diff options
Diffstat (limited to 'src/corelib/global/qlibraryinfo_p.h')
-rw-r--r-- | src/corelib/global/qlibraryinfo_p.h | 63 |
1 files changed, 21 insertions, 42 deletions
diff --git a/src/corelib/global/qlibraryinfo_p.h b/src/corelib/global/qlibraryinfo_p.h index a0900f010b..4b471b932e 100644 --- a/src/corelib/global/qlibraryinfo_p.h +++ b/src/corelib/global/qlibraryinfo_p.h @@ -1,42 +1,6 @@ -/**************************************************************************** -** -** Copyright (C) 2021 The Qt Company Ltd. -** Copyright (C) 2016 Intel Corporation. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** 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-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// Copyright (C) 2016 Intel Corporation. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QLIBRARYINFO_P_H #define QLIBRARYINFO_P_H @@ -53,6 +17,7 @@ // #include "QtCore/qlibraryinfo.h" +#include "QtCore/private/qglobal_p.h" #if QT_CONFIG(settings) # include "QtCore/qsettings.h" @@ -67,10 +32,24 @@ public: #if QT_CONFIG(settings) static QSettings *configuration(); static void reload(); - static QString qtconfManualPath; + static void setQtconfManualPath(const QString *qtconfManualPath); #endif - static void keyAndDefault(QLibraryInfo::LibraryPath loc, QString *key, - QString *value); + + struct LocationInfo + { + QString key; + QString defaultValue; + QString fallbackKey; + }; + + static LocationInfo locationInfo(QLibraryInfo::LibraryPath loc); + + enum UsageMode { + RegularUsage, + UsedFromQtBinDir + }; + + static QString path(QLibraryInfo::LibraryPath p, UsageMode usageMode = RegularUsage); }; QT_END_NAMESPACE |