From c211b1dbbeba2d66afbec6492cdd012737a34f2b Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 17 Aug 2024 11:57:13 +0200 Subject: [PATCH] SQL/Doc: remove paragraph about CMAKE_INCLUDE/LIBRARY_PATH Using CMAKE_INCLUDE_PATH/CMAKE_LIBRARY_PATH to find the correct database includes and libraries does work but is nothing which should be documented here - it's a common way to specify common paths for cmake. Documenting this here just confuses the user (which already has hard times to compile the plugins by itself). Change-Id: I0cb051f06f3c71f005290700e3b6c32da9a0b2b5 Reviewed-by: Venugopal Shivashankar Reviewed-by: Alexandru Croitor (cherry picked from commit e279dd8c20794810292047c8c84f309e8aed004b) Reviewed-by: Qt Cherry-pick Bot --- .../doc/snippets/code/doc_src_sql-driver.qdoc | 18 ------------------ src/sql/doc/src/sql-driver.qdoc | 8 -------- 2 files changed, 26 deletions(-) diff --git a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc index 896839a1d97..733c76d5537 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -253,24 +253,6 @@ Qt Sql Drivers: ... //! [42] -//! [43] -C:\Qt\6.0.0\Src\configure.bat -sql-mysql -- -DCMAKE_INCLUDE_PATH="C:\mysql-8.0.22-winx64\include" -DCMAKE_LIBRARY_PATH="C:\mysql-8.0.22-winx64\lib" -Configure summary: - -... -Qt Sql Drivers: - DB2 (IBM) .............................. no - InterBase .............................. no - Mimer SQL .............................. yes - MySql .................................. yes - OCI (Oracle) ........................... no - ODBC ................................... yes - PostgreSQL ............................. no - SQLite ................................. yes - Using system provided SQLite ......... no -... -//! [43] - //! [44] create procedure inout_proc (INOUT param1 INT, OUT param2 INT) BEGIN diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index 4cc5b0d0506..88388a7ef37 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -77,14 +77,6 @@ useful if the package provides its own set of system libraries that should not be recognized by the build routine. - In some cases it's more convenient to use \c CMAKE_INCLUDE_PATH - and \c CMAKE_LIBRARY_PATH variables to locate required libraries. - You should prefer this method if module needs to set properties - for the provided target libraries (e.g. this is required for PostgreSQL - and SQLite). - For example, you can do this as follows, to locate MySQL: - \snippet code/doc_src_sql-driver.qdoc 43 - The particulars for each driver are explained below. \note If something goes wrong and you want CMake to recheck your