1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove usage of the definitions that are never defined

Browse Source 
The QT_BUILD_QMAKE_BOOTSTRAP and QT_BUILD_QMAKE_LIBRARY definitions
are never defined in the project since migrating to CMake build.

Change-Id: I7108c92387005a2fde6ebdb2d74843e3efc6413e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexey Edelev 2021-01-28 16:30:01 +01:00
parent 658b93386e
commit 295d4d6955
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmake/option.cpp
View File

@ -455,12 +455,10 @@ Option::init(int argc, char **argv)
QString proj = detectProjectFile(qmake_getpwd()); QString proj = detectProjectFile(qmake_getpwd());
if(!proj.isNull()) if(!proj.isNull())
Option::mkfile::project_files.append(proj); Option::mkfile::project_files.append(proj);
#ifndef QT_BUILD_QMAKE_LIBRARY
if(Option::mkfile::project_files.isEmpty()) { if(Option::mkfile::project_files.isEmpty()) {
usage(argv[0]); usage(argv[0]);
return Option::QMAKE_CMDLINE_ERROR; return Option::QMAKE_CMDLINE_ERROR;
} }
#endif
} }
} }

12
src/corelib/global/qlibraryinfo.cpp
View File

@ -55,10 +55,8 @@ QT_END_NAMESPACE
# include "qcoreapplication.h" # include "qcoreapplication.h"
#endif #endif
#ifndef QT_BUILD_QMAKE_BOOTSTRAP #include "private/qglobal_p.h"
# include "private/qglobal_p.h" #include "qconfig.cpp"
# include "qconfig.cpp"
#endif
#ifdef Q_OS_DARWIN #ifdef Q_OS_DARWIN
# include "private/qcore_mac_p.h" # include "private/qcore_mac_p.h"
@ -595,7 +593,7 @@ static QString getRelocatablePrefix()
} }
#endif #endif
#if defined(QT_BUILD_QMAKE) && !defined(QT_BUILD_QMAKE_BOOTSTRAP) #if defined(QT_BUILD_QMAKE)
QString qmake_abslocation(); QString qmake_abslocation();
static QString getPrefixFromHostBinDir(const char *hostBinDirToPrefixPath) static QString getPrefixFromHostBinDir(const char *hostBinDirToPrefixPath)
@ -616,7 +614,6 @@ static QString getHostPrefixFromHostBinDir()
} }
#endif #endif
#ifndef QT_BUILD_QMAKE_BOOTSTRAP
static QString getPrefix( static QString getPrefix(
#ifdef QT_BUILD_QMAKE #ifdef QT_BUILD_QMAKE
QLibraryInfo::PathGroup group QLibraryInfo::PathGroup group
@ -637,7 +634,6 @@ static QString getPrefix(
return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH); return QString::fromLocal8Bit(QT_CONFIGURE_PREFIX_PATH);
#endif #endif
} }
#endif // QT_BUILD_QMAKE_BOOTSTRAP
/*! \fn QString QLibraryInfo::location(LibraryLocation loc) /*! \fn QString QLibraryInfo::location(LibraryLocation loc)
\obsolete Use path() instead. \obsolete Use path() instead.
@ -754,7 +750,6 @@ QLibraryInfo::rawLocation(LibraryPath loc, PathGroup group)
} }
#endif // settings #endif // settings
#ifndef QT_BUILD_QMAKE_BOOTSTRAP
if (!fromConf) { if (!fromConf) {
// "volatile" here is a hack to prevent compilers from doing a // "volatile" here is a hack to prevent compilers from doing a
// compile-time strlen() on "path". The issue is that Qt installers // compile-time strlen() on "path". The issue is that Qt installers
@ -784,7 +779,6 @@ QLibraryInfo::rawLocation(LibraryPath loc, PathGroup group)
if (path) if (path)
ret = QString::fromLocal8Bit(path); ret = QString::fromLocal8Bit(path);
} }
#endif
#ifdef QT_BUILD_QMAKE #ifdef QT_BUILD_QMAKE
// These values aren't actually paths and thus need to be returned verbatim. // These values aren't actually paths and thus need to be returned verbatim.