diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-01 15:03:15 +0100 |
|---|---|---|
| committer | Alexey Edelev <alexey.edelev@qt.io> | 2021-03-01 17:36:48 +0100 |
| commit | 93f55570c4800d78760ad76207d8410622efaa9c (patch) | |
| tree | cbe98a58b5333427168416733f78986512272994 | |
| parent | e14ccf05534bbc2984b15f7f255adbffc4c7f769 (diff) | |
Remove unused definitions
QT_CONFIGURE_CROSSBUILD is always '0', so it's not necessary to keep
conditional compilation in QMakeLibraryInfo.
Also the QT_CONFIGURE_SYSROOTIFY_PREFIX definition is never used
in the project.
Task-number: QTBUG-75870
Change-Id: I1fe42dce40fddc6a72254736883f93aa4727f6b3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| -rw-r--r-- | qmake/qmakelibraryinfo.cpp | 10 | ||||
| -rw-r--r-- | src/corelib/global/qconfig.cpp.in | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/qmake/qmakelibraryinfo.cpp b/qmake/qmakelibraryinfo.cpp index 581d1ad086..273da190d4 100644 --- a/qmake/qmakelibraryinfo.cpp +++ b/qmake/qmakelibraryinfo.cpp @@ -156,14 +156,8 @@ static QString getHostPrefixFromHostBinDir() return getPrefixFromHostBinDir(QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH); } -static QString getPrefix(QMakeLibraryInfo::PathGroup group) +static QString getPrefix() { -#if QT_CONFIGURE_CROSSBUILD - if (group == QMakeLibraryInfo::DevicePaths) - return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH); -#else - Q_UNUSED(group); -#endif return getExtPrefixFromHostBinDir(); } @@ -268,7 +262,7 @@ QString QMakeLibraryInfo::rawLocation(int loc, QMakeLibraryInfo::PathGroup group // strlen is meaningless. const char *volatile path = nullptr; if (loc == QLibraryInfo::PrefixPath) { - ret = getPrefix(group); + ret = getPrefix(); } else if (unsigned(loc) <= sizeof(qt_configure_str_offsets) / sizeof(qt_configure_str_offsets[0])) { path = qt_configure_strs + qt_configure_str_offsets[loc - 1]; diff --git a/src/corelib/global/qconfig.cpp.in b/src/corelib/global/qconfig.cpp.in index d61b94c806..ddfe1c65e1 100644 --- a/src/corelib/global/qconfig.cpp.in +++ b/src/corelib/global/qconfig.cpp.in @@ -38,10 +38,6 @@ static const char qt_configure_strs[] = #define QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH "@QT_CONFIGURE_LIBLOCATION_TO_PREFIX_PATH@" #define QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_EXTPREFIX_PATH@" #define QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH "@QT_CONFIGURE_HOSTBINDIR_TO_HOSTPREFIX_PATH@" -#ifdef QT_BUILD_QMAKE -# define QT_CONFIGURE_CROSSBUILD 0 -# define QT_CONFIGURE_SYSROOTIFY_PREFIX false -#endif #define QT_CONFIGURE_PREFIX_PATH qt_configure_prefix_path_str + 12 #ifdef QT_BUILD_QMAKE # define QT_CONFIGURE_EXT_PREFIX_PATH qt_configure_ext_prefix_path_str + 12 |