whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update SQL plugin path within Qt's sources 

The current SQL plugins path are still Qt 4 style. This patch adds
qtbase to ensure users will be directed to the right place.

Change-Id: I11bf933864f0a8955079bf7175eb1e33bb5bc07f
Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
bb10
Samuel Gaist 2015-02-16 00:46:48 +01:00
parent 662027678b
commit de98302f70
2 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,34 +60,34 @@ END
//! [3]
cd $QTDIR/src/plugins/sqldrivers/mysql
cd $QTDIR/qtbase/src/plugins/sqldrivers/mysql
qmake "INCLUDEPATH+=/usr/local/include" "LIBS+=-L/usr/local/lib -lmysqlclient_r" mysql.pro
make
//! [3]
//! [4]
cd $QTDIR/src/plugins/sqldrivers/mysql
cd $QTDIR/qtbase/src/plugins/sqldrivers/mysql
make install
//! [4]
//! [5]
cd %QTDIR%\src\plugins\sqldrivers\mysql
cd %QTDIR%\qtbase\src\plugins\sqldrivers\mysql
qmake "INCLUDEPATH+=C:/MySQL/include" "LIBS+=C:/MYSQL/MySQL Server <version>/lib/opt/libmysql.lib" mysql.pro
nmake
//! [5]
//! [6]
cd $QTDIR/src/plugins/sqldrivers/oci
cd $QTDIR/qtbase/src/plugins/sqldrivers/oci
qmake "INCLUDEPATH+=$ORACLE_HOME/rdbms/public $ORACLE_HOME/rdbms/demo" "LIBS+=-L$ORACLE_HOME/lib -lclntsh -lwtc9" oci.pro
make
//! [6]
//! [7]
cd $QTDIR/src/plugins/sqldrivers/oci
cd $QTDIR/qtbase/src/plugins/sqldrivers/oci
qmake "INCLUDEPATH+=/usr/include/oracle/10.1.0.3/client/" "LIBS+=-L/usr/lib/oracle/10.1.0.3/client/lib -lclntsh" oci.pro
make
//! [7]
@ -96,7 +96,7 @@ make
//! [8]
set INCLUDE=%INCLUDE%;c:\oracle\oci\include
set LIB=%LIB%;c:\oracle\oci\lib\msvc
cd %QTDIR%\src\plugins\sqldrivers\oci
cd %QTDIR%\qtbase\src\plugins\sqldrivers\oci
qmake oci.pro
nmake
//! [8]
@ -108,116 +108,116 @@ set PATH=%PATH%;c:\oracle\bin
//! [11]
cd $QTDIR/src/plugins/sqldrivers/odbc
cd $QTDIR/qtbase/src/plugins/sqldrivers/odbc
qmake "INCLUDEPATH+=/usr/local/unixODBC/include" "LIBS+=-L/usr/local/unixODBC/lib -lodbc"
make
//! [11]
//! [12]
cd %QTDIR%\src\plugins\sqldrivers\odbc
cd %QTDIR%\qtbase\src\plugins\sqldrivers\odbc
qmake odbc.pro
nmake
//! [12]
//! [13]
cd $QTDIR/src/plugins/sqldrivers/psql
cd $QTDIR/qtbase/src/plugins/sqldrivers/psql
qmake "INCLUDEPATH+=/usr/include/pgsql" "LIBS+=-L/usr/lib -lpq" psql.pro
make
//! [13]
//! [14]
cd $QTDIR/src/plugins/sqldrivers/psql
cd $QTDIR/qtbase/src/plugins/sqldrivers/psql
make install
//! [14]
//! [15]
cd %QTDIR%\src\plugins\sqldrivers\psql
cd %QTDIR%\qtbase\src\plugins\sqldrivers\psql
qmake "INCLUDEPATH+=C:/psql/include" "LIBS+=C:/psql/lib/ms/libpq.lib" psql.pro
nmake
//! [15]
//! [16]
cd $QTDIR/src/plugins/sqldrivers/tds
cd $QTDIR/qtbase/src/plugins/sqldrivers/tds
qmake "INCLUDEPATH=$SYBASE/include" "LIBS=-L$SYBASE/lib -lsybdb"
make
//! [16]
//! [17]
cd %QTDIR%\src\plugins\sqldrivers\tds
cd %QTDIR%\qtbase\src\plugins\sqldrivers\tds
qmake "LIBS+=NTWDBLIB.LIB" tds.pro
nmake
//! [17]
//! [18]
cd $QTDIR/src/plugins/sqldrivers/db2
cd $QTDIR/qtbase/src/plugins/sqldrivers/db2
qmake "INCLUDEPATH+=$DB2DIR/include" "LIBS+=-L$DB2DIR/lib -ldb2"
make
//! [18]
//! [19]
cd $QTDIR/src/plugins/sqldrivers/db2
cd $QTDIR/qtbase/src/plugins/sqldrivers/db2
make install
//! [19]
//! [20]
cd %QTDIR%\src\plugins\sqldrivers\db2
cd %QTDIR%\qtbase\src\plugins\sqldrivers\db2
qmake "INCLUDEPATH+=<DB2 home>/sqllib/include" "LIBS+=<DB2 home>/sqllib/lib/db2cli.lib"
nmake
//! [20]
//! [21]
cd $QTDIR/src/plugins/sqldrivers/sqlite
cd $QTDIR/qtbase/src/plugins/sqldrivers/sqlite
qmake "INCLUDEPATH+=$SQLITE/include" "LIBS+=-L$SQLITE/lib -lsqlite"
make
//! [21]
//! [22]
cd $QTDIR/src/plugins/sqldrivers/sqlite
cd $QTDIR/qtbase/src/plugins/sqldrivers/sqlite
make install
//! [22]
//! [23]
cd %QTDIR%\src\plugins\sqldrivers\sqlite
cd %QTDIR%\qtbase\src\plugins\sqldrivers\sqlite
qmake "INCLUDEPATH+=C:/SQLITE/INCLUDE" "LIBS+=C:/SQLITE/LIB/SQLITE3.LIB" sqlite.pro
nmake
//! [23]
//! [27]
cd $QTDIR/src/plugins/sqldrivers/ibase
cd $QTDIR/qtbase/src/plugins/sqldrivers/ibase
qmake "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib" ibase.pro
make
//! [27]
//! [28]
cd $QTDIR/src/plugins/sqldrivers/ibase
cd $QTDIR/qtbase/src/plugins/sqldrivers/ibase
qmake "INCLUDEPATH+=/opt/interbase/include" "LIBS+=-L/opt/interbase/lib -lfbclient" ibase.pro
make
//! [28]
//! [29]
cd %QTDIR%\src\plugins\sqldrivers\ibase
cd %QTDIR%\qtbase\src\plugins\sqldrivers\ibase
qmake "INCLUDEPATH+=C:/interbase/include" ibase.pro
nmake
//! [29]
//! [30]
cd %QTDIR%\src\plugins\sqldrivers\ibase
cd %QTDIR%\qtbase\src\plugins\sqldrivers\ibase
qmake "INCLUDEPATH+=C:/interbase/include" "LIBS+=-lfbclient" ibase.pro
nmake
//! [30]
@ -229,7 +229,7 @@ make
//! [32]
//! [33]
cd $QTDIR/src/plugins/sqldrivers/oci
cd $QTDIR/qtbase/src/plugins/sqldrivers/oci
qmake "INCLUDEPATH+=/usr/include/oracle/10.1.0.3/client" "LIBS+=-L/usr/lib/oracle/10.1.0.3/client/lib -Wl,-rpath,/usr/lib/oracle/10.1.0.3/client/lib -lclntsh -lnnz10" oci.pro
make
//! [33]

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

@ -471,7 +471,7 @@
By default the Microsoft library is used on Windows, if you want to
force the use of the Sybase Open Client, you must define \c
Q_USE_SYBASE in \c{%QTDIR%\src\sql\drivers\tds\qsql_tds.cpp}. If you
Q_USE_SYBASE in \c{%QTDIR%\qtbase\src\sql\drivers\tds\qsql_tds.cpp}. If you
are not using a Microsoft compiler, replace \c nmake with \c make in
the line above.
@ -751,7 +751,7 @@
must use the Q_PLUGIN_METADATA() macro. Read \l{How to Create Qt
Plugins} for more information on this. You can also check out how
this is done in the SQL plugins that are provided with Qt in
\c{QTDIR/src/plugins/sqldrivers} and \c{QTDIR/src/sql/drivers}.
\c{QTDIR/qtbase/src/plugins/sqldrivers} and \c{QTDIR/qtbase/src/sql/drivers}.
The following code can be used as a skeleton for a SQL driver: