summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Ehrlicher <[email protected]>2024-08-16 23:15:46 +0200
committerChristian Ehrlicher <[email protected]>2024-08-28 21:52:26 +0200
commita664a6e225abdd4a62aac57df10e3507fcd2b561 (patch)
treed367661f6393f4528b124d553852425eae35b0fe
parent3ac48281d9971998882612a43cbcf923104ee592 (diff)
SQL/PostgreSQL: use PostgreSQL_ROOT in documentation
Instead specifying CMAKE_INCLUDE_PATH/CMAKE_LIBRARY_PATH use PostgreSQL_ROOT which is suits much better for the usecase. Pick-to: 6.8 Change-Id: Iac239d88d4c9c11d5482acacb2bbb1bb034c4365 Reviewed-by: Alexandru Croitor <[email protected]> Reviewed-by: Venugopal Shivashankar <[email protected]>
-rw-r--r--src/sql/doc/snippets/code/doc_src_sql-driver.qdoc4
-rw-r--r--src/sql/doc/src/sql-driver.qdoc2
2 files changed, 3 insertions, 3 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 733c76d5537..66a8a5e1ca2 100644
--- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
+++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
@@ -87,7 +87,7 @@ cmake --install .
mkdir build-psql-driver
cd build-psql-driver
-qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers-DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DCMAKE_INCLUDE_PATH="/usr/local/pgsql/include" -DCMAKE_LIBRARY_PATH="/usr/local/pgsql/lib"
+qt-cmake -G Ninja <qt_source_directory>/qtbase/src/plugins/sqldrivers-DCMAKE_INSTALL_PREFIX=<qt_installation_path>/<platform> -DPostgreSQL_ROOT="/usr/local/pgsql"
cmake --build .
cmake --install .
//! [13]
@@ -96,7 +96,7 @@ cmake --install .
//! [15]
mkdir build-sqldrivers
cd build-sqldrivers
-qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DCMAKE_INCLUDE_PATH="C:\pgsql\include" -DCMAKE_LIBRARY_PATH="C:\pgsql\lib"
+qt-cmake -G Ninja <qt_installation_path>\Src\qtbase\src\plugins\sqldrivers -DCMAKE_INSTALL_PREFIX=<qt_installation_path>\<platform> -DPostgreSQL_ROOT="C:\pgsql"
cmake --build .
cmake --install .
//! [15]
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc
index 67744558200..5e097865c1d 100644
--- a/src/sql/doc/src/sql-driver.qdoc
+++ b/src/sql/doc/src/sql-driver.qdoc
@@ -93,7 +93,7 @@
Due to the practicalities of dealing with external dependencies,
only the SQLite plugin is shipped with binary builds of Qt.
- Binary builds of Qt for Windows also include the ODBC plugin.
+ Binary builds of Qt for Windows also include the ODBC and PostgreSQL plugin.
To be able to add additional drivers to the Qt installation
without re-building all of Qt, it is possible to configure
and build the \c qtbase/src/plugins/sqldrivers directory outside