From d47ee52e34aa3a5c7d8f1f861710010745dabebf Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 25 Sep 2012 15:29:11 +0200 Subject: [PATCH] fix incorrect uses of qmake in documentation Assigning backslashes to qmake variables yields a warning these days. Use forward slashes as they get automatically converted. Task-number: QTBUG-27325 Change-Id: I804fa641064ce183e9794026ad1dbc91725d334d Reviewed-by: Mark Brand --- src/sql/doc/snippets/code/doc_src_sql-driver.qdoc | 10 +++++----- src/sql/doc/src/sql-driver.qdoc | 2 +- 2 files changed, 6 insertions(+), 6 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 1368c263ef..7bcd7d1aed 100644 --- a/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc +++ b/src/sql/doc/snippets/code/doc_src_sql-driver.qdoc @@ -74,7 +74,7 @@ make install //! [5] cd %QTDIR%\src\plugins\sqldrivers\mysql -qmake "INCLUDEPATH+=C:\MySQL\include" "LIBS+=C:\MYSQL\MySQL Server \lib\opt\libmysql.lib" mysql.pro +qmake "INCLUDEPATH+=C:/MySQL/include" "LIBS+=C:/MYSQL/MySQL Server /lib/opt/libmysql.lib" mysql.pro nmake //! [5] @@ -136,7 +136,7 @@ make install //! [15] cd %QTDIR%\src\plugins\sqldrivers\psql -qmake "INCLUDEPATH+=C:\psql\include" "LIBS+=C:\psql\lib\ms\libpq.lib" psql.pro +qmake "INCLUDEPATH+=C:/psql/include" "LIBS+=C:/psql/lib/ms/libpq.lib" psql.pro nmake //! [15] @@ -190,7 +190,7 @@ make install //! [23] cd %QTDIR%\src\plugins\sqldrivers\sqlite -qmake "INCLUDEPATH+=C:\SQLITE\INCLUDE" "LIBS+=C:\SQLITE\LIB\SQLITE3.LIB" sqlite.pro +qmake "INCLUDEPATH+=C:/SQLITE/INCLUDE" "LIBS+=C:/SQLITE/LIB/SQLITE3.LIB" sqlite.pro nmake //! [23] @@ -211,14 +211,14 @@ make //! [29] cd %QTDIR%\src\plugins\sqldrivers\ibase -qmake "INCLUDEPATH+=C:\interbase\include" ibase.pro +qmake "INCLUDEPATH+=C:/interbase/include" ibase.pro nmake //! [29] //! [30] cd %QTDIR%\src\plugins\sqldrivers\ibase -qmake "INCLUDEPATH+=C:\interbase\include" "LIBS+=-lfbclient" ibase.pro +qmake "INCLUDEPATH+=C:/interbase/include" "LIBS+=-lfbclient" ibase.pro nmake //! [30] diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index 88957d08bf..57efa5c4cc 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -229,7 +229,7 @@ \c{C:\Qt\4.6.2\src\plugins\sqldrivers\mysql} and run the following command: \list - \li \c{qmake "INCLUDEPATH+=C:\MySQL\MySQL51\include" "LIBS+=-L. mysql" mysql.pro} + \li \c{qmake "INCLUDEPATH+=C:/MySQL/MySQL51/include" "LIBS+=-L. mysql" mysql.pro} \endlist \li Now the following libraries are ready in \c{C:\Qt\4.6.2\plugins\sqldrivers}.