diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:19:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 21:02:08 +0100 |
| commit | 34b14a8472f44f8517577756e033b92ebd4c5912 (patch) | |
| tree | 66a0575156d0a17a835430137e218e2b3f04cc65 /src/sql/doc/snippets | |
| parent | d34353a065c443aac20376cbd88323480d769183 (diff) | |
| parent | edd555425a08f9e074f0a4d9333862636ccaae8d (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
examples/xml/htmlinfo/simpleexample.html
examples/xml/rsslisting/rsslisting.cpp
qmake/generators/win32/msbuild_objectmodel.cpp
src/3rdparty/harfbuzz-ng/src/hb-private.hh
src/corelib/global/qlogging.cpp
src/corelib/io/qstorageinfo_unix.cpp
src/corelib/thread/qwaitcondition_unix.cpp
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
src/testlib/doc/src/qt-webpages.qdoc
tests/auto/other/qaccessibility/tst_qaccessibility.cpp
Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
Diffstat (limited to 'src/sql/doc/snippets')
| -rw-r--r-- | src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 48 |
1 files changed, 24 insertions, 24 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 a3152cd217..fee36e3537 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -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] |