diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-29 13:51:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-29 15:30:17 +0200 |
commit | 1cc571593a67f3e688a5cbb896f0be71ca5a2b30 (patch) | |
tree | c652360c9276cbf475244fd02313d64e3df11a96 /src/sql/doc | |
parent | 829c59aa4acf94bd979f6a3162808be36802d79a (diff) | |
parent | cc74452d6d259d36ac47c536f11a5efb269e8e44 (diff) |
Merge remote-tracking branch 'origin/5.7' into 5.8
cf53aa21bf0f8fbd13c0ce2d33ddf7bc63d0d76a and 3aaa5d6b32130d3eeac872a59a5a44bfb20dfd4a
were reverted because of reconstruction in 5.7.
defineTest(qtConfTest_checkCompiler) in configure.pri is smart
enough to cover the case in a9474d1260a8c8cc9eae14f2984098919d9684e5.
DirectWrite: Fix advances being scaled to 0
Since 131eee5cd, the stretch of a font can be 0, meaning
"whatever the font provides". In combination with ec7fee96,
this would cause advances in the DirectWrite engine to be scaled to
0, causing the QRawFont test to fail.
Conflicts:
configure
mkspecs/features/uikit/device_destinations.sh
mkspecs/features/uikit/xcodebuild.mk
src/corelib/global/qglobal.cpp
src/corelib/global/qnamespace.qdoc
src/plugins/platforms/cocoa/qcocoamenuitem.h
src/plugins/platforms/windows/qwindowsservices.cpp
src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp
src/plugins/platforms/windows/qwindowsfontenginedirectwrite.cpp
src/widgets/kernel/qapplication.cpp
tests/auto/widgets/dialogs/qfiledialog/tst_qfiledialog.cpp
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp
Change-Id: I4656d8133da7ee9fcc84ad3f1c7950f924432d1e
Diffstat (limited to 'src/sql/doc')
-rw-r--r-- | src/sql/doc/src/sql-driver.qdoc | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/sql/doc/src/sql-driver.qdoc b/src/sql/doc/src/sql-driver.qdoc index a33f60b561..364d733e92 100644 --- a/src/sql/doc/src/sql-driver.qdoc +++ b/src/sql/doc/src/sql-driver.qdoc @@ -168,8 +168,6 @@ If you are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \note This database plugin is not supported for Windows CE. - \note Including \c{"-o Makefile"} as an argument to \l qmake to tell it where to build the makefile can cause the plugin to be built in release mode only. If you are expecting a debug version @@ -261,8 +259,6 @@ \snippet code/doc_src_sql-driver.qdoc 9 - \b{Note:} This database plugin is not supported for Windows CE. - \target QODBC \section2 QODBC for Open Database Connectivity (ODBC) @@ -365,8 +361,6 @@ If you are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \b{Note:} This database plugin is not officially supported for Windows CE. - \target QPSQL \section2 QPSQL for PostgreSQL (Version 7.3 and Above) @@ -426,8 +420,6 @@ Users of MinGW may wish to consult the following online document: \l{http://www.postgresql.org/docs/current/static/installation-platform-notes.html#INSTALLATION-NOTES-MINGW}{PostgreSQL MinGW/Native Windows}. - \b{Note:} This database plugin is not supported for Windows CE. - \target QTDS \section2 QTDS for Sybase Adaptive Server @@ -475,8 +467,6 @@ are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \b{Note:} This database plugin is not supported for Windows CE. - \target QDB2 \section2 QDB2 for IBM DB2 (Version 7.1 and Above) @@ -512,8 +502,6 @@ If you are not using a Microsoft compiler, replace \c nmake with \c make in the line above. - \b{Note:} This database plugin is not supported for Windows CE. - \target QSQLITE2 \section2 QSQLITE2 for SQLite Version 2 @@ -674,8 +662,6 @@ Note that \c{C:\interbase\bin} must be in the \c PATH. - \b{Note:} This database plugin is not supported for Windows CE. - \target troubleshooting \section1 Troubleshooting |