diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-08-03 01:00:16 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-08-07 17:44:51 +0200 |
commit | 053e7cce79d4bef99ec85101b0d22bbb171072c5 (patch) | |
tree | c2059e82cccdea1fd0024c5942d1a834c28d39da /src/sql | |
parent | a420d02538d28854914a6978c9637a0ddd652146 (diff) | |
parent | f271dd8f960ad9f61697dfa57b26c4071441cadc (diff) |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
.qmake.conf
src/corelib/doc/src/objectmodel/signalsandslots.qdoc
src/plugins/platforms/cocoa/qcocoamenuloader.mm
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
tests/auto/gui/image/qimage/tst_qimage.cpp
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I9bd24ee9b00d4f26c8f344ce3970aa6e93935ff5
Diffstat (limited to 'src/sql')
-rw-r--r-- | src/sql/README.module | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/src/sql/README.module b/src/sql/README.module deleted file mode 100644 index 511d90e83f..0000000000 --- a/src/sql/README.module +++ /dev/null @@ -1,37 +0,0 @@ -Before building the Qt library, the Qt SQL module can be enabled for -specific databases using 'configure'. 'configure' is located at the -top of your QTDIR. - -Specific databases drivers can be enabled using one of the following -options: - - ./configure [-qt-sql-<driver>] [-plugin-sql-<driver>] - -or disabled using the following option: - - ./configure [-no-sql-<driver>] - -Where <driver> is the name of the driver, for example 'psql'. This -will configure the Qt library to compile the specified driver into -the Qt lib itself. - -For example, to build the PostgreSQL driver directly into the Qt -library, configure Qt like this: - - ./configure -qt-sql-psql - -In addition, you may need to specify an extra include path, as some -database drivers require headers for the database they are using, -for example: - - ./configure -qt-sql-psql -I/usr/local/include - -If instead you need to build the PostgreSQL driver as a dynamically -loaded plugin, configure Qt like this: - - ./configure -plugin-sql-psql - -To compile drivers as dynamically loaded plugins, see the -QTDIR/plugins/src/sqldrivers directory. Use 'configure -help' -for a complete list of configure options. See the Qt documentation -for a complete list of supported database drivers. |