summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSona Kurazyan <sona.kurazyan@qt.io>2022-08-24 13:02:42 +0200
committerYuhang Zhao <2546789017@qq.com>2022-08-29 11:02:05 +0800
commitf5be5c6b14acb84ba1dac954c0284ded467f1542 (patch)
tree56e48a2178f2d5f679e8be9146d43ba38668c3da
parent52162eebe5339f53df4b3afb026e163e64b44ae2 (diff)
Move qSharedBuild() from qglobal.h to qlibraryinfo.h
[ChangeLog][Potentially Source-Incompatible Changes] qSharedBuild() is moved from qglobal.h to qlibraryinfo.h, '#include <QtCore/QLibraryInfo>' needs to be added where it's used. Task-number: QTBUG-99313 Change-Id: Ic64561a8eb129ba2934e2770ca02119de208a2a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Yuhang Zhao <2546789017@qq.com>
-rw-r--r--src/corelib/global/qglobal.cpp9
-rw-r--r--src/corelib/global/qglobal.h2
-rw-r--r--src/corelib/global/qlibraryinfo.cpp9
-rw-r--r--src/corelib/global/qlibraryinfo.h2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index bcd0292cdb..57892b4109 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -807,15 +807,6 @@ const char *qVersion() noexcept
return QT_VERSION_STR;
}
-bool qSharedBuild() noexcept
-{
-#ifdef QT_SHARED
- return true;
-#else
- return false;
-#endif
-}
-
/*****************************************************************************
System detection routines
*****************************************************************************/
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 735143237c..bdf484d245 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -109,8 +109,6 @@ private:
#endif // Q_OS_DARWIN
-Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept;
-
/*
Debugging and error handling
*/
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index d931dfac48..755a4c6c39 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -646,6 +646,15 @@ QStringList QLibraryInfo::platformPluginArguments(const QString &platformName)
\deprecated Use LibraryPath with QLibraryInfo::path() instead.
*/
+bool qSharedBuild() noexcept
+{
+#ifdef QT_SHARED
+ return true;
+#else
+ return false;
+#endif
+}
+
QT_END_NAMESPACE
#if defined(Q_CC_GNU) && defined(ELF_INTERPRETER)
diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index e0f2273787..8e6788d067 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -53,6 +53,8 @@ private:
QLibraryInfo();
};
+Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept;
+
QT_END_NAMESPACE
#endif // QLIBRARYINFO_H