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

SQL/PostgreSQL: use PostgreSQL_ROOT in documentation

Browse Source 
Instead specifying CMAKE_INCLUDE_PATH/CMAKE_LIBRARY_PATH use
PostgreSQL_ROOT which is suits much better for the usecase.

Change-Id: Iac239d88d4c9c11d5482acacb2bbb1bb034c4365
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
(cherry picked from commit a664a6e225abdd4a62aac57df10e3507fcd2b561)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2024-08-16 23:15:46 +02:00 committed by Qt Cherry-pick Bot
parent 8e0d08d0c6
commit 517d11d0c5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/doc/snippets/code/doc_src_sql-driver.qdoc
View File

@ -87,7 +87,7 @@ cmake --install .
mkdir build-psql-driver mkdir build-psql-driver
cd 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 --build .
cmake --install . cmake --install .
//! [13] //! [13]
@ -96,7 +96,7 @@ cmake --install .
//! [15] //! [15]
mkdir build-sqldrivers mkdir build-sqldrivers
cd 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 --build .
cmake --install . cmake --install .
//! [15] //! [15]

2
src/sql/doc/src/sql-driver.qdoc
View File

@ -93,7 +93,7 @@
Due to the practicalities of dealing with external dependencies, Due to the practicalities of dealing with external dependencies,
only the SQLite plugin is shipped with binary builds of Qt. 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 To be able to add additional drivers to the Qt installation
without re-building all of Qt, it is possible to configure without re-building all of Qt, it is possible to configure
and build the \c qtbase/src/plugins/sqldrivers directory outside and build the \c qtbase/src/plugins/sqldrivers directory outside