Do not leak build env paths into public headers

m-kuhn · Feb 22, 2024 · b105226 · b105226
1 parent dc73608
commit b105226
Show file tree

Hide file tree

Showing 77 changed files with 364 additions and 205 deletions.
diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in
@@ -30,8 +30,6 @@
 #define QGIS_LIBEXEC_SUBDIR "${QGIS_LIBEXEC_SUBDIR}"
 #define QGIS_LIB_SUBDIR "${QGIS_LIB_SUBDIR}"
 #define QGIS_QML_SUBDIR "${QGIS_QML_SUBDIR}"
-#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
-#define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}"
 
 #define QGIS_SERVER_MODULE_SUBDIR "${QGIS_SERVER_MODULE_SUBDIR}"
 
@@ -44,8 +42,6 @@
 #define QGIS_MACAPP_BUNDLE ${QGIS_MACAPP_BUNDLE}
 #endif
 
-#define QT_PLUGINS_DIR "${QT_PLUGINS_DIR}"
-
 #define PYTHON_VERSION "${Python_VERSION}"
 #define PYTHON_VERSION_MAJOR "${Python_VERSION_MAJOR}"
 #define PYTHON_VERSION_MINOR "${Python_VERSION_MINOR}"

diff --git a/python/PyQt6/core/auto_generated/network/qgsnetworkaccessmanager.sip.in b/python/PyQt6/core/auto_generated/network/qgsnetworkaccessmanager.sip.in
@@ -11,7 +11,6 @@
 
 
 
-
 class QgsNetworkRequestParameters
 {
 %Docstring(signature="appended")

diff --git a/python/PyQt6/core/auto_generated/qgsdbquerylog.sip.in b/python/PyQt6/core/auto_generated/qgsdbquerylog.sip.in
@@ -51,7 +51,6 @@ Constructor for QgsDatabaseQueryLogEntry.
 };
 
 
-
 class QgsDatabaseQueryLog: QObject
 {
 %Docstring(signature="appended")

diff --git a/python/core/auto_generated/network/qgsnetworkaccessmanager.sip.in b/python/core/auto_generated/network/qgsnetworkaccessmanager.sip.in
@@ -11,7 +11,6 @@
 
 
 
-
 class QgsNetworkRequestParameters
 {
 %Docstring(signature="appended")

diff --git a/python/core/auto_generated/qgsdbquerylog.sip.in b/python/core/auto_generated/qgsdbquerylog.sip.in
@@ -51,7 +51,6 @@ Constructor for QgsDatabaseQueryLogEntry.
 };
 
 
-
 class QgsDatabaseQueryLog: QObject
 {
 %Docstring(signature="appended")

diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -524,6 +524,8 @@ add_library(qgis_app ${LIBRARY_TYPE} ${QGIS_APP_SRCS})
 # require c++17
 target_compile_features(qgis_app PRIVATE cxx_std_17)
 
+target_compile_definitions(qgis_app PRIVATE "QT_PLUGINS_DIR=\"${QT_PLUGINS_DIR}\"")
+
 target_include_directories(qgis_app PUBLIC
   ${CMAKE_SOURCE_DIR}/external/nmea
 

diff --git a/src/auth/oauth2/CMakeLists.txt b/src/auth/oauth2/CMakeLists.txt
@@ -104,6 +104,7 @@ target_include_directories(authmethod_oauth2_a PUBLIC ${CMAKE_SOURCE_DIR}/src/au
 
 # require c++17
 target_compile_features(authmethod_oauth2_a PRIVATE cxx_std_17)
+target_compile_definitions(authmethod_oauth2_a PRIVATE "CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"")
 
 target_link_libraries(authmethod_oauth2_a qgis_core)
 
@@ -146,6 +147,7 @@ else()
 
   # require c++17
   target_compile_features(authmethod_oauth2 PRIVATE cxx_std_17)
+  target_compile_definitions(authmethod_oauth2 PRIVATE "CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"")
 
   target_link_libraries(authmethod_oauth2 qgis_core)
 

diff --git a/src/auth/oauth2/core/qgso2.cpp b/src/auth/oauth2/core/qgso2.cpp
@@ -21,6 +21,7 @@
 #include "qgsauthoauth2config.h"
 #include "qgslogger.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsblockingnetworkrequest.h"
 
 #include <QDir>

diff --git a/src/auth/oauth2/gui/qgsauthoauth2edit.cpp b/src/auth/oauth2/gui/qgsauthoauth2edit.cpp
@@ -28,6 +28,7 @@
 #include "qgsauthconfigedit.h"
 #include "qgsmessagelog.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 
 QgsAuthOAuth2Edit::QgsAuthOAuth2Edit( QWidget *parent )
   : QgsAuthMethodEdit( parent )

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -2573,6 +2573,7 @@ if (${QT_VERSION_BASE}Positioning_FOUND)
 endif()
 
 target_compile_definitions(qgis_core PRIVATE "-DQT_NO_FOREACH")
+target_compile_definitions(qgis_core PRIVATE "CMAKE_SOURCE_DIR=\"${CMAKE_SOURCE_DIR}\"")
 
 # clang-tidy
 if(CLANG_TIDY_EXE)

diff --git a/src/core/externalstorage/qgshttpexternalstorage.cpp b/src/core/externalstorage/qgshttpexternalstorage.cpp
@@ -18,6 +18,7 @@
 #include "qgsnetworkcontentfetcherregistry.h"
 #include "qgsblockingnetworkrequest.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsapplication.h"
 #include "qgsfeedback.h"
 

diff --git a/src/core/geocoding/qgsgooglemapsgeocoder.cpp b/src/core/geocoding/qgsgooglemapsgeocoder.cpp
@@ -17,6 +17,7 @@
 #include "qgsgeocodercontext.h"
 #include "qgslogger.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsblockingnetworkrequest.h"
 #include "qgsreadwritelocker.h"
 #include "qgscoordinatetransform.h"

diff --git a/src/core/geocoding/qgsnominatimgeocoder.cpp b/src/core/geocoding/qgsnominatimgeocoder.cpp
@@ -18,6 +18,7 @@
 #include "qgsgeocodercontext.h"
 #include "qgslogger.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgscoordinatetransform.h"
 #include <QDateTime>
 #include <QUrl>

diff --git a/src/core/network/qgsfiledownloader.cpp b/src/core/network/qgsfiledownloader.cpp
@@ -15,6 +15,7 @@
 
 #include "qgsfiledownloader.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsapplication.h"
 #include "qgsauthmanager.h"
 #include "qgsvariantutils.h"

diff --git a/src/core/network/qgsnetworkaccessmanager.h b/src/core/network/qgsnetworkaccessmanager.h
@@ -38,14 +38,6 @@
 class QgsFeedback;
 class QgsSettingsEntryInteger;
 
-#ifndef SIP_RUN
-#include "qgsconfig.h"
-constexpr int sFilePrefixLength = CMAKE_SOURCE_DIR[sizeof( CMAKE_SOURCE_DIR ) - 1] == '/' ? sizeof( CMAKE_SOURCE_DIR ) + 1 : sizeof( CMAKE_SOURCE_DIR );
-
-#define QgsSetRequestInitiatorClass(request, _class) request.setAttribute( static_cast< QNetworkRequest::Attribute >( QgsNetworkRequestParameters::AttributeInitiatorClass ), _class ); request.setAttribute( static_cast< QNetworkRequest::Attribute >( QgsNetworkRequestParameters::AttributeInitiatorRequestId ), QString(QString( __FILE__ ).mid( sFilePrefixLength ) + ':' + QString::number( __LINE__ ) + " (" + __FUNCTION__ + ")") );
-#define QgsSetRequestInitiatorId(request, str) request.setAttribute( static_cast< QNetworkRequest::Attribute >( QgsNetworkRequestParameters::AttributeInitiatorRequestId ), QString(QString( __FILE__ ).mid( sFilePrefixLength ) + ':' + QString::number( __LINE__ ) + " (" + __FUNCTION__ + "): " + str) );
-#endif
-
 /**
  * \class QgsNetworkRequestParameters
  * \ingroup core

diff --git a/src/core/network/qgsnetworkcontentfetcher.cpp b/src/core/network/qgsnetworkcontentfetcher.cpp
@@ -18,6 +18,7 @@
 
 #include "qgsnetworkcontentfetcher.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsmessagelog.h"
 #include "qgsapplication.h"
 #include "qgsauthmanager.h"

diff --git a/src/core/network/qgsnewsfeedparser.cpp b/src/core/network/qgsnewsfeedparser.cpp
@@ -17,6 +17,7 @@
 #include "qgsnetworkcontentfetchertask.h"
 #include "qgsnetworkcontentfetcher.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsjsonutils.h"
 #include "qgsmessagelog.h"
 #include "qgsapplication.h"

diff --git a/src/core/network/qgssetrequestinitiator_p.h b/src/core/network/qgssetrequestinitiator_p.h
@@ -0,0 +1,29 @@
+/***************************************************************************
+                          qgssetrequestinitiator.h  -  description
+                             -------------------
+    begin                : 2024-02-10
+    copyright            : (C) 2024 by Matthias Kuhn
+    email                : matthias@opengis.ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSSETREQUESTINITIATOR_P_H
+#define QGSSETREQUESTINITIATOR_P_H
+
+#include "qgsnetworkaccessmanager.h"
+
+constexpr int sFilePrefixLength = CMAKE_SOURCE_DIR[sizeof( CMAKE_SOURCE_DIR ) - 1] == '/' ? sizeof( CMAKE_SOURCE_DIR ) + 1 : sizeof( CMAKE_SOURCE_DIR );
+
+#define QgsSetRequestInitiatorClass(request, _class) request.setAttribute( static_cast< QNetworkRequest::Attribute >( QgsNetworkRequestParameters::AttributeInitiatorClass ), _class ); request.setAttribute( static_cast< QNetworkRequest::Attribute >( QgsNetworkRequestParameters::AttributeInitiatorRequestId ), QString(QString( __FILE__ ).mid( sFilePrefixLength ) + ':' + QString::number( __LINE__ ) + " (" + __FUNCTION__ + ")") );
+#define QgsSetRequestInitiatorId(request, str) request.setAttribute( static_cast< QNetworkRequest::Attribute >( QgsNetworkRequestParameters::AttributeInitiatorRequestId ), QString(QString( __FILE__ ).mid( sFilePrefixLength ) + ':' + QString::number( __LINE__ ) + " (" + __FUNCTION__ + "): " + str) );
+
+#define QgsSetCPLHTTPFetchOverriderInitiatorClass(overrider, _class) QgsSetRequestInitiatorClass((overrider), _class)
+#endif // QGSSETREQUESTINITIATOR_P_H
diff --git a/src/core/pointcloud/qgscopcpointcloudblockrequest.cpp b/src/core/pointcloud/qgscopcpointcloudblockrequest.cpp
@@ -21,6 +21,7 @@
 #include "qgslazdecoder.h"
 #include "qgsapplication.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 
 //
 // QgsCopcPointCloudBlockRequest

diff --git a/src/core/pointcloud/qgseptpointcloudblockrequest.cpp b/src/core/pointcloud/qgseptpointcloudblockrequest.cpp
@@ -22,6 +22,7 @@
 #include "qgslazdecoder.h"
 #include "qgsapplication.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 
 //
 // QgsEptPointCloudBlockRequest

diff --git a/src/core/pointcloud/qgslazinfo.cpp b/src/core/pointcloud/qgslazinfo.cpp
@@ -20,6 +20,7 @@
 #include "qgslogger.h"
 #include "qgsblockingnetworkrequest.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 
 #include "lazperf/readers.hpp"
 

diff --git a/src/core/pointcloud/qgsremotecopcpointcloudindex.cpp b/src/core/pointcloud/qgsremotecopcpointcloudindex.cpp
@@ -37,6 +37,7 @@
 #include "qgscachedpointcloudblockrequest.h"
 #include "qgspointcloudexpression.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 
 ///@cond PRIVATE
 

diff --git a/src/core/pointcloud/qgsremoteeptpointcloudindex.cpp b/src/core/pointcloud/qgsremoteeptpointcloudindex.cpp
@@ -39,6 +39,7 @@
 #include "qgscachedpointcloudblockrequest.h"
 #include "qgspointcloudexpression.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 
 ///@cond PRIVATE
 

diff --git a/src/core/providers/arcgis/qgsarcgisrestquery.cpp b/src/core/providers/arcgis/qgsarcgisrestquery.cpp
@@ -17,6 +17,7 @@
 #include "qgsarcgisrestutils.h"
 #include "qgsblockingnetworkrequest.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgslogger.h"
 #include "qgsapplication.h"
 #include "qgsmessagelog.h"

diff --git a/src/core/providers/ogr/qgsogrfeatureiterator.cpp b/src/core/providers/ogr/qgsogrfeatureiterator.cpp
@@ -27,6 +27,8 @@
 #include "qgssymbol.h"
 #include "qgsgeometryengine.h"
 #include "qgsdbquerylog.h"
+#include "qgsdbquerylog_p.h"
+#include "qgssetrequestinitiator_p.h"
 
 #include <sqlite3.h>
 

diff --git a/src/core/providers/ogr/qgsogrprovider.cpp b/src/core/providers/ogr/qgsogrprovider.cpp
@@ -38,6 +38,8 @@ email                : sherman at mrcc.com
 #include "qgsproviderregistry.h"
 #include "qgsvariantutils.h"
 #include "qgsjsonutils.h"
+#include "qgssetrequestinitiator_p.h"
+
 #include <nlohmann/json.hpp>
 
 #define CPL_SUPRESS_CPLUSPLUS  //#spellok

diff --git a/src/core/providers/ogr/qgsogrproviderconnection.cpp b/src/core/providers/ogr/qgsogrproviderconnection.cpp
@@ -25,6 +25,7 @@
 #include "qgsfielddomain.h"
 #include "qgsogrproviderutils.h"
 #include "qgsdbquerylog.h"
+#include "qgsdbquerylog_p.h"
 #include "qgsprovidersublayerdetails.h"
 #include "qgsweakrelation.h"
 #if GDAL_VERSION_NUM < GDAL_COMPUTE_VERSION(3,4,0)

diff --git a/src/core/providers/sensorthings/qgssensorthingsprovider.cpp b/src/core/providers/sensorthings/qgssensorthingsprovider.cpp
@@ -19,6 +19,7 @@
 #include "qgssensorthingsutils.h"
 #include "qgsapplication.h"
 #include "qgsnetworkaccessmanager.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsblockingnetworkrequest.h"
 #include "qgsthreadingutils.h"
 #include "qgsreadwritelocker.h"

diff --git a/src/core/providers/sensorthings/qgssensorthingsshareddata.cpp b/src/core/providers/sensorthings/qgssensorthingsshareddata.cpp
@@ -19,6 +19,7 @@
 #include "qgslogger.h"
 #include "qgsreadwritelocker.h"
 #include "qgsblockingnetworkrequest.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsnetworkaccessmanager.h"
 #include "qgsjsonutils.h"
 

diff --git a/src/core/providers/sensorthings/qgssensorthingsutils.cpp b/src/core/providers/sensorthings/qgssensorthingsutils.cpp
@@ -17,6 +17,7 @@
 #include "qgsfield.h"
 #include "qgsfields.h"
 #include "qgswkbtypes.h"
+#include "qgssetrequestinitiator_p.h"
 #include "qgsnetworkaccessmanager.h"
 #include "qgsblockingnetworkrequest.h"
 #include "qgslogger.h"

diff --git a/src/core/qgsabstractcontentcache.cpp b/src/core/qgsabstractcontentcache.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsabstractcontentcache.h"
+#include "qgssetrequestinitiator_p.h"
 
 //
 // QgsAbstractContentCacheEntry
@@ -39,8 +40,3 @@ void QgsAbstractContentCacheBase::onRemoteContentFetched( const QString &, bool
 {
 
 }
-
-
-
-
-