summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/3rdparty/CMakeLists.txt6
-rw-r--r--src/3rdparty/_clang-format2
-rw-r--r--src/3rdparty/forkfd/forkfd_linux.c4
-rw-r--r--src/3rdparty/freetype/CMakeLists.txt14
-rw-r--r--src/3rdparty/gradle/CMakeLists.txt16
-rw-r--r--src/3rdparty/gradle/gradle.pro13
-rw-r--r--src/3rdparty/gradle/gradle.properties9
-rw-r--r--src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt12
-rw-r--r--src/3rdparty/harfbuzz-ng/CMakeLists.txt12
-rw-r--r--src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro2
-rw-r--r--src/3rdparty/libjpeg.pri2
-rw-r--r--src/3rdparty/libjpeg/LICENSE2
-rw-r--r--src/3rdparty/libjpeg/jconfig.h4
-rw-r--r--src/3rdparty/libjpeg/jconfigint.h2
-rw-r--r--src/3rdparty/libjpeg/qt_attribution.json4
-rw-r--r--src/3rdparty/libjpeg/src/ChangeLog.md38
-rw-r--r--src/3rdparty/libjpeg/src/jconfigint.h.in3
-rw-r--r--src/3rdparty/libjpeg/src/jdatadst.c3
-rw-r--r--src/3rdparty/libjpeg/src/jversion.h6
-rw-r--r--src/3rdparty/libpng/CMakeLists.txt8
-rw-r--r--src/3rdparty/libpng/qt_attribution.json4
-rw-r--r--src/3rdparty/pcre2/.prev_CMakeLists.txt12
-rw-r--r--src/3rdparty/pcre2/CMakeLists.txt12
-rw-r--r--src/3rdparty/rfc6234/sha.h3
-rw-r--r--src/3rdparty/sqlite/qt_attribution.json4
-rw-r--r--src/3rdparty/sqlite/sqlite3.c19228
-rw-r--r--src/3rdparty/sqlite/sqlite3.h1378
-rw-r--r--src/3rdparty/tinycbor/qt_attribution.json2
-rw-r--r--src/3rdparty/wasm/qt_attribution.json3
-rw-r--r--src/3rdparty/wintab/qt_attribution.json4
-rw-r--r--src/CMakeLists.txt10
-rw-r--r--src/android/jar/.prev_CMakeLists.txt32
-rw-r--r--src/android/jar/AndroidManifest.xml2
-rw-r--r--src/android/jar/CMakeLists.txt36
-rw-r--r--src/android/jar/jar.pro4
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/CursorHandle.java (renamed from src/android/jar/src/org/qtproject/qt5/android/CursorHandle.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/EditContextView.java (renamed from src/android/jar/src/org/qtproject/qt5/android/EditContextView.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/EditPopupMenu.java (renamed from src/android/jar/src/org/qtproject/qt5/android/EditPopupMenu.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/ExtractStyle.java (renamed from src/android/jar/src/org/qtproject/qt5/android/ExtractStyle.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtActivityDelegate.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java)4
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtEditText.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtEditText.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtInputConnection.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtInputConnection.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtLayout.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtLayout.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtMessageDialogHelper.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtMessageDialogHelper.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtNative.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtNative.java)125
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtNativeLibrariesDir.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtNativeLibrariesDir.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtServiceDelegate.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtServiceDelegate.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtSurface.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtSurface.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/QtThread.java (renamed from src/android/jar/src/org/qtproject/qt5/android/QtThread.java)2
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/accessibility/QtAccessibilityDelegate.java (renamed from src/android/jar/src/org/qtproject/qt5/android/accessibility/QtAccessibilityDelegate.java)4
-rw-r--r--src/android/jar/src/org/qtproject/qt/android/accessibility/QtNativeAccessibility.java (renamed from src/android/jar/src/org/qtproject/qt5/android/accessibility/QtNativeAccessibility.java)2
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtActivity.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtActivity.java)131
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtActivityLoader.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java)9
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtApplication.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtApplication.java)4
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtLoader.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java)2
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtService.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtService.java)2
-rw-r--r--src/android/java/src/org/qtproject/qt/android/bindings/QtServiceLoader.java (renamed from src/android/java/src/org/qtproject/qt5/android/bindings/QtServiceLoader.java)4
-rw-r--r--src/android/templates/AndroidManifest.xml10
-rw-r--r--src/android/templates/build.gradle9
-rw-r--r--src/concurrent/CMakeLists.txt7
-rw-r--r--src/concurrent/concurrent.pro1
-rw-r--r--src/concurrent/doc/snippets/code/src_concurrent_qtconcurrentrun.cpp88
-rw-r--r--src/concurrent/doc/src/qt6-changes.qdoc46
-rw-r--r--src/concurrent/doc/src/qtconcurrent-index.qdoc17
-rw-r--r--src/concurrent/doc/src/qtconcurrent-module.qdoc14
-rw-r--r--src/concurrent/qtaskbuilder.h2
-rw-r--r--src/concurrent/qtconcurrentcompilertest.h4
-rw-r--r--src/concurrent/qtconcurrentfilter.cpp56
-rw-r--r--src/concurrent/qtconcurrentfilter.h238
-rw-r--r--src/concurrent/qtconcurrentfilterkernel.h36
-rw-r--r--src/concurrent/qtconcurrentfunctionwrappers.h20
-rw-r--r--src/concurrent/qtconcurrentmap.cpp52
-rw-r--r--src/concurrent/qtconcurrentmap.h310
-rw-r--r--src/concurrent/qtconcurrentmapkernel.h51
-rw-r--r--src/concurrent/qtconcurrentreducekernel.h46
-rw-r--r--src/concurrent/qtconcurrentrun.cpp159
-rw-r--r--src/concurrent/qtconcurrentrun.h145
-rw-r--r--src/concurrent/qtconcurrentstoredfunctioncall.h89
-rw-r--r--src/corelib/.prev_CMakeLists.txt280
-rw-r--r--src/corelib/.prev_configure.cmake1002
-rw-r--r--src/corelib/CMakeLists.txt444
-rw-r--r--src/corelib/Qt5AndroidSupport.cmake202
-rw-r--r--src/corelib/Qt5CoreMacros.cmake507
-rw-r--r--src/corelib/Qt6AndroidMacros.cmake289
-rw-r--r--src/corelib/Qt6CTestMacros.cmake6
-rw-r--r--src/corelib/Qt6Config.cmake.in51
-rw-r--r--src/corelib/Qt6CoreConfigExtras.cmake.in9
-rw-r--r--src/corelib/Qt6CoreConfigExtrasMkspecDir.cmake.in6
-rw-r--r--src/corelib/Qt6CoreConfigExtrasMkspecDirForInstall.cmake.in6
-rw-r--r--src/corelib/Qt6CoreMacros.cmake208
-rw-r--r--src/corelib/Qt6ModuleLocation.cmake.in15
-rw-r--r--src/corelib/Qt6ModuleLocationForInstall.cmake.in6
-rw-r--r--src/corelib/animation/qabstractanimation.cpp59
-rw-r--r--src/corelib/animation/qabstractanimation.h8
-rw-r--r--src/corelib/animation/qabstractanimation_p.h2
-rw-r--r--src/corelib/animation/qvariantanimation.cpp7
-rw-r--r--src/corelib/configure.cmake25
-rw-r--r--src/corelib/configure.json26
-rw-r--r--src/corelib/corelib.pro3
-rw-r--r--src/corelib/doc/images/statemachine-button-history.pngbin8493 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-button-nested.pngbin7051 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-button.pngbin4233 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-customevents.pngbin2544 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-customevents2.pngbin6713 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-examples.pngbin3326 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-finished.pngbin5518 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-nonparallel.pngbin5350 -> 0 bytes
-rw-r--r--src/corelib/doc/images/statemachine-parallel.pngbin8631 -> 0 bytes
-rw-r--r--src/corelib/doc/qtcore.qdocconf4
-rw-r--r--src/corelib/doc/snippets/cmake-macros/examples.cmake6
-rw-r--r--src/corelib/doc/snippets/code/doc_src_properties.cpp6
-rw-r--r--src/corelib/doc/snippets/code/doc_src_qiterator.cpp78
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qdiriterator.cpp4
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_io_qprocess.cpp40
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qabstractitemmodel.cpp45
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qcoreapplication.cpp2
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_kernel_qmetatype.cpp5
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_statemachine_qstatemachine.cpp65
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qanystringview.cpp (renamed from src/gui/doc/snippets/code/src_gui_painting_qmatrix.cpp)23
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qbytearray.cpp4
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qbytearrayview.cpp7
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qlocale.cpp38
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qregularexpression.cpp9
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qstringview.cpp4
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_text_qutf8stringview.cpp (renamed from src/gui/doc/snippets/plaintextlayout/main.cpp)18
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qlist.cpp17
-rw-r--r--src/corelib/doc/snippets/code/src_corelib_tools_qmultimap.cpp324
-rw-r--r--src/corelib/doc/snippets/eventfilters/filterobject.h2
-rw-r--r--src/corelib/doc/snippets/overview/using-qt-core.cmake4
-rw-r--r--src/corelib/doc/snippets/qsignalmapper/buttonwidget.h1
-rw-r--r--src/corelib/doc/snippets/qsortfilterproxymodel-details/main.cpp4
-rw-r--r--src/corelib/doc/snippets/qstring/main.cpp30
-rw-r--r--src/corelib/doc/snippets/qstring/stringbuilder.cpp2
-rw-r--r--src/corelib/doc/snippets/qstringlist/main.cpp2
-rw-r--r--src/corelib/doc/snippets/qstringlistmodel/main.cpp2
-rw-r--r--src/corelib/doc/snippets/statemachine/main.cpp98
-rw-r--r--src/corelib/doc/snippets/statemachine/main2.cpp103
-rw-r--r--src/corelib/doc/snippets/statemachine/main3.cpp70
-rw-r--r--src/corelib/doc/snippets/statemachine/main4.cpp122
-rw-r--r--src/corelib/doc/snippets/statemachine/main5.cpp182
-rw-r--r--src/corelib/doc/src/animation.qdoc43
-rw-r--r--src/corelib/doc/src/cmake-macros.qdoc6
-rw-r--r--src/corelib/doc/src/external-resources.qdoc4
-rw-r--r--src/corelib/doc/src/objectmodel/metaobjects.qdoc2
-rw-r--r--src/corelib/doc/src/qt6-changes.qdoc276
-rw-r--r--src/corelib/doc/src/qtcore-index.qdoc4
-rw-r--r--src/corelib/doc/src/statemachine.qdoc577
-rw-r--r--src/corelib/global/global.pri2
-rw-r--r--src/corelib/global/qcompilerdetection.h37
-rw-r--r--src/corelib/global/qconfig.cpp.in2
-rw-r--r--src/corelib/global/qcontainerinfo.h261
-rw-r--r--src/corelib/global/qendian.h52
-rw-r--r--src/corelib/global/qendian_p.h2
-rw-r--r--src/corelib/global/qflags.h119
-rw-r--r--src/corelib/global/qfloat16.h35
-rw-r--r--src/corelib/global/qfloat16tables.cpp524
-rw-r--r--src/corelib/global/qglobal.cpp37
-rw-r--r--src/corelib/global/qglobal.h260
-rw-r--r--src/corelib/global/qhooks.cpp2
-rw-r--r--src/corelib/global/qlibraryinfo.cpp62
-rw-r--r--src/corelib/global/qlibraryinfo.h14
-rw-r--r--src/corelib/global/qlogging.cpp22
-rw-r--r--src/corelib/global/qlogging.h10
-rw-r--r--src/corelib/global/qmalloc.cpp23
-rw-r--r--src/corelib/global/qnamespace.h228
-rw-r--r--src/corelib/global/qnamespace.qdoc438
-rw-r--r--src/corelib/global/qnumeric_p.h89
-rw-r--r--src/corelib/global/qoperatingsystemversion.h14
-rw-r--r--src/corelib/global/qrandom.cpp123
-rw-r--r--src/corelib/global/qrandom.h28
-rw-r--r--src/corelib/global/qt_windows.h2
-rw-r--r--src/corelib/global/qtypeinfo.h174
-rw-r--r--src/corelib/io/io.pri1
-rw-r--r--src/corelib/io/qdebug.cpp30
-rw-r--r--src/corelib/io/qdebug.h122
-rw-r--r--src/corelib/io/qdir.cpp59
-rw-r--r--src/corelib/io/qdir.h17
-rw-r--r--src/corelib/io/qdiriterator.cpp7
-rw-r--r--src/corelib/io/qfile.cpp80
-rw-r--r--src/corelib/io/qfile.h31
-rw-r--r--src/corelib/io/qfiledevice.cpp2
-rw-r--r--src/corelib/io/qfiledevice.h8
-rw-r--r--src/corelib/io/qfileinfo.cpp71
-rw-r--r--src/corelib/io/qfileinfo.h34
-rw-r--r--src/corelib/io/qfilesystemengine_unix.cpp42
-rw-r--r--src/corelib/io/qfilesystemengine_win.cpp53
-rw-r--r--src/corelib/io/qfilesystemiterator_unix.cpp2
-rw-r--r--src/corelib/io/qfilesystemwatcher_win.cpp3
-rw-r--r--src/corelib/io/qiodevice.cpp80
-rw-r--r--src/corelib/io/qiodevice.h26
-rw-r--r--src/corelib/io/qiodevice_p.h48
-rw-r--r--src/corelib/io/qiodevicebase.h (renamed from src/corelib/statemachine/qfinalstate_p.h)43
-rw-r--r--src/corelib/io/qlockfile.cpp8
-rw-r--r--src/corelib/io/qlockfile.h2
-rw-r--r--src/corelib/io/qloggingregistry.cpp2
-rw-r--r--src/corelib/io/qprocess.cpp178
-rw-r--r--src/corelib/io/qprocess.h38
-rw-r--r--src/corelib/io/qprocess_p.h42
-rw-r--r--src/corelib/io/qprocess_unix.cpp15
-rw-r--r--src/corelib/io/qprocess_win.cpp4
-rw-r--r--src/corelib/io/qresource.cpp71
-rw-r--r--src/corelib/io/qresource.h13
-rw-r--r--src/corelib/io/qsettings.cpp50
-rw-r--r--src/corelib/io/qsettings.h8
-rw-r--r--src/corelib/io/qsettings_mac.cpp64
-rw-r--r--src/corelib/io/qsettings_win.cpp2
-rw-r--r--src/corelib/io/qstandardpaths.cpp13
-rw-r--r--src/corelib/io/qstandardpaths.h5
-rw-r--r--src/corelib/io/qstandardpaths_android.cpp2
-rw-r--r--src/corelib/io/qstandardpaths_unix.cpp164
-rw-r--r--src/corelib/io/qstorageinfo.h2
-rw-r--r--src/corelib/io/qstorageinfo_unix.cpp2
-rw-r--r--src/corelib/io/qurl.cpp131
-rw-r--r--src/corelib/io/qurl.h77
-rw-r--r--src/corelib/io/qurlquery.cpp14
-rw-r--r--src/corelib/io/qurlquery.h2
-rw-r--r--src/corelib/io/qurlrecode.cpp2
-rw-r--r--src/corelib/io/qwindowspipereader.cpp20
-rw-r--r--src/corelib/io/qwindowspipereader_p.h4
-rw-r--r--src/corelib/io/qwindowspipewriter.cpp20
-rw-r--r--src/corelib/io/qwindowspipewriter_p.h4
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.cpp310
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel.h139
-rw-r--r--src/corelib/itemmodels/qabstractitemmodel_p.h6
-rw-r--r--src/corelib/itemmodels/qitemselectionmodel.cpp4
-rw-r--r--src/corelib/itemmodels/qitemselectionmodel.h35
-rw-r--r--src/corelib/itemmodels/qsortfilterproxymodel.cpp3
-rw-r--r--src/corelib/kernel/kernel.pri35
-rw-r--r--src/corelib/kernel/qabstracteventdispatcher.cpp48
-rw-r--r--src/corelib/kernel/qabstracteventdispatcher.h7
-rw-r--r--src/corelib/kernel/qassociativeiterable.cpp253
-rw-r--r--src/corelib/kernel/qassociativeiterable.h197
-rw-r--r--src/corelib/kernel/qbasictimer.h6
-rw-r--r--src/corelib/kernel/qcore_foundation.mm246
-rw-r--r--src/corelib/kernel/qcore_mac.mm35
-rw-r--r--src/corelib/kernel/qcore_mac_p.h64
-rw-r--r--src/corelib/kernel/qcore_unix_p.h3
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp158
-rw-r--r--src/corelib/kernel/qcoreapplication.h31
-rw-r--r--src/corelib/kernel/qcoreapplication_p.h10
-rw-r--r--src/corelib/kernel/qcoreevent.cpp36
-rw-r--r--src/corelib/kernel/qcoreevent.h14
-rw-r--r--src/corelib/kernel/qdeadlinetimer.h6
-rw-r--r--src/corelib/kernel/qelapsedtimer.h2
-rw-r--r--src/corelib/kernel/qeventdispatcher_cf.mm25
-rw-r--r--src/corelib/kernel/qeventdispatcher_cf_p.h6
-rw-r--r--src/corelib/kernel/qeventdispatcher_glib.cpp12
-rw-r--r--src/corelib/kernel/qeventdispatcher_glib_p.h4
-rw-r--r--src/corelib/kernel/qeventdispatcher_unix.cpp13
-rw-r--r--src/corelib/kernel/qeventdispatcher_unix_p.h4
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp83
-rw-r--r--src/corelib/kernel/qeventdispatcher_win_p.h15
-rw-r--r--src/corelib/kernel/qeventloop.cpp4
-rw-r--r--src/corelib/kernel/qfunctions_nacl.cpp154
-rw-r--r--src/corelib/kernel/qfunctions_nacl.h92
-rw-r--r--src/corelib/kernel/qfunctions_p.h2
-rw-r--r--src/corelib/kernel/qiterable.cpp625
-rw-r--r--src/corelib/kernel/qiterable.h548
-rw-r--r--src/corelib/kernel/qiterable_p.cpp (renamed from src/corelib/global/qtypetraits.h)32
-rw-r--r--src/corelib/kernel/qiterable_p.h (renamed from src/corelib/statemachine/qsignaleventgenerator_p.h)40
-rw-r--r--src/corelib/kernel/qjni.cpp2
-rw-r--r--src/corelib/kernel/qjni_p.h2
-rw-r--r--src/corelib/kernel/qjnihelpers.cpp8
-rw-r--r--src/corelib/kernel/qjnihelpers_p.h1
-rw-r--r--src/corelib/kernel/qmath.h40
-rw-r--r--src/corelib/kernel/qmath.qdoc34
-rw-r--r--src/corelib/kernel/qmetacontainer.cpp867
-rw-r--r--src/corelib/kernel/qmetacontainer.h1234
-rw-r--r--src/corelib/kernel/qmetaobject.cpp133
-rw-r--r--src/corelib/kernel/qmetaobject.h13
-rw-r--r--src/corelib/kernel/qmetaobject_p.h6
-rw-r--r--src/corelib/kernel/qmetaobjectbuilder.cpp37
-rw-r--r--src/corelib/kernel/qmetaobjectbuilder_p.h2
-rw-r--r--src/corelib/kernel/qmetatype.cpp2102
-rw-r--r--src/corelib/kernel/qmetatype.h1898
-rw-r--r--src/corelib/kernel/qmetatype_p.h50
-rw-r--r--src/corelib/kernel/qmetatypeswitcher_p.h89
-rw-r--r--src/corelib/kernel/qmimedata.cpp67
-rw-r--r--src/corelib/kernel/qmimedata.h3
-rw-r--r--src/corelib/kernel/qobject.cpp299
-rw-r--r--src/corelib/kernel/qobject.h32
-rw-r--r--src/corelib/kernel/qobject_impl.h19
-rw-r--r--src/corelib/kernel/qobject_p.h24
-rw-r--r--src/corelib/kernel/qobjectdefs.h23
-rw-r--r--src/corelib/kernel/qpoll.cpp2
-rw-r--r--src/corelib/kernel/qppsattribute.cpp308
-rw-r--r--src/corelib/kernel/qppsattribute_p.h138
-rw-r--r--src/corelib/kernel/qppsattributeprivate_p.h89
-rw-r--r--src/corelib/kernel/qppsobject.cpp966
-rw-r--r--src/corelib/kernel/qppsobject_p.h127
-rw-r--r--src/corelib/kernel/qppsobjectprivate_p.h128
-rw-r--r--src/corelib/kernel/qproperty.cpp641
-rw-r--r--src/corelib/kernel/qproperty.h1055
-rw-r--r--src/corelib/kernel/qproperty_p.h335
-rw-r--r--src/corelib/kernel/qpropertyprivate.h140
-rw-r--r--src/corelib/kernel/qsequentialiterable.cpp258
-rw-r--r--src/corelib/kernel/qsequentialiterable.h189
-rw-r--r--src/corelib/kernel/qsocketnotifier.h6
-rw-r--r--src/corelib/kernel/qsystemerror.cpp6
-rw-r--r--src/corelib/kernel/qsystemerror_p.h8
-rw-r--r--src/corelib/kernel/qtestsupport_core.cpp21
-rw-r--r--src/corelib/kernel/qtestsupport_core.h11
-rw-r--r--src/corelib/kernel/qtimer.cpp86
-rw-r--r--src/corelib/kernel/qtimer.h27
-rw-r--r--src/corelib/kernel/qtimerinfo_unix.cpp8
-rw-r--r--src/corelib/kernel/qtimerinfo_unix_p.h4
-rw-r--r--src/corelib/kernel/qtmetamacros.h45
-rw-r--r--src/corelib/kernel/qtranslator.h23
-rw-r--r--src/corelib/kernel/qvariant.cpp3205
-rw-r--r--src/corelib/kernel/qvariant.h589
-rw-r--r--src/corelib/kernel/qvariant_p.h340
-rw-r--r--src/corelib/kernel/qwineventnotifier.cpp4
-rw-r--r--src/corelib/kernel/qwineventnotifier_p.h2
-rw-r--r--src/corelib/kernel/qwinregistry_p.h6
-rw-r--r--src/corelib/mimetypes/mimetypes_resources.cmake2
-rw-r--r--src/corelib/mimetypes/qmimedatabase.cpp28
-rw-r--r--src/corelib/mimetypes/qmimeprovider.cpp15
-rw-r--r--src/corelib/mimetypes/qmimeprovider_p.h3
-rw-r--r--src/corelib/mimetypes/qmimetype.h2
-rw-r--r--src/corelib/mimetypes/qmimetypeparser.cpp23
-rw-r--r--src/corelib/mimetypes/qmimetypeparser_p.h3
-rw-r--r--src/corelib/plugin/qlibrary.cpp31
-rw-r--r--src/corelib/plugin/qlibrary.h9
-rw-r--r--src/corelib/plugin/qmachparser.cpp2
-rw-r--r--src/corelib/plugin/qplugin.h9
-rw-r--r--src/corelib/plugin/qpluginloader.cpp53
-rw-r--r--src/corelib/plugin/quuid.cpp90
-rw-r--r--src/corelib/plugin/quuid.h32
-rw-r--r--src/corelib/qt_cmdline.cmake14
-rw-r--r--src/corelib/serialization/qcborarray.h11
-rw-r--r--src/corelib/serialization/qcborcommon.cpp2
-rw-r--r--src/corelib/serialization/qcborcommon.h6
-rw-r--r--src/corelib/serialization/qcbormap.h11
-rw-r--r--src/corelib/serialization/qcborstreamreader.cpp7
-rw-r--r--src/corelib/serialization/qcborstreamwriter.cpp6
-rw-r--r--src/corelib/serialization/qcborvalue.cpp153
-rw-r--r--src/corelib/serialization/qcborvalue.h17
-rw-r--r--src/corelib/serialization/qcborvalue_p.h4
-rw-r--r--src/corelib/serialization/qdatastream.cpp40
-rw-r--r--src/corelib/serialization/qdatastream.h84
-rw-r--r--src/corelib/serialization/qjson_p.h18
-rw-r--r--src/corelib/serialization/qjsonarray.cpp59
-rw-r--r--src/corelib/serialization/qjsonarray.h61
-rw-r--r--src/corelib/serialization/qjsoncbor.cpp60
-rw-r--r--src/corelib/serialization/qjsondocument.cpp6
-rw-r--r--src/corelib/serialization/qjsondocument.h2
-rw-r--r--src/corelib/serialization/qjsonobject.cpp82
-rw-r--r--src/corelib/serialization/qjsonobject.h56
-rw-r--r--src/corelib/serialization/qjsonparser.cpp40
-rw-r--r--src/corelib/serialization/qjsonvalue.cpp171
-rw-r--r--src/corelib/serialization/qjsonvalue.h27
-rw-r--r--src/corelib/serialization/qtextstream.cpp91
-rw-r--r--src/corelib/serialization/qtextstream.h59
-rw-r--r--src/corelib/serialization/qtextstream_p.h3
-rw-r--r--src/corelib/serialization/qxmlstream.cpp226
-rw-r--r--src/corelib/serialization/qxmlstream.g506
-rw-r--r--src/corelib/serialization/qxmlstream.h115
-rw-r--r--src/corelib/serialization/qxmlstream_p.h1719
-rw-r--r--src/corelib/serialization/qxmlstreamgrammar.cpp532
-rw-r--r--src/corelib/serialization/qxmlstreamgrammar_p.h164
-rw-r--r--src/corelib/serialization/qxmlstreamparser_p.h1027
-rw-r--r--src/corelib/serialization/serialization.pri3
-rw-r--r--src/corelib/statemachine/qabstractstate.cpp239
-rw-r--r--src/corelib/statemachine/qabstractstate.h88
-rw-r--r--src/corelib/statemachine/qabstractstate_p.h99
-rw-r--r--src/corelib/statemachine/qabstracttransition.cpp435
-rw-r--r--src/corelib/statemachine/qabstracttransition.h117
-rw-r--r--src/corelib/statemachine/qabstracttransition_p.h94
-rw-r--r--src/corelib/statemachine/qeventtransition.cpp256
-rw-r--r--src/corelib/statemachine/qeventtransition.h85
-rw-r--r--src/corelib/statemachine/qfinalstate.cpp141
-rw-r--r--src/corelib/statemachine/qfinalstate.h73
-rw-r--r--src/corelib/statemachine/qhistorystate.cpp334
-rw-r--r--src/corelib/statemachine/qhistorystate.h95
-rw-r--r--src/corelib/statemachine/qhistorystate_p.h80
-rw-r--r--src/corelib/statemachine/qsignaltransition.cpp287
-rw-r--r--src/corelib/statemachine/qsignaltransition.h99
-rw-r--r--src/corelib/statemachine/qstate.cpp603
-rw-r--r--src/corelib/statemachine/qstate.h134
-rw-r--r--src/corelib/statemachine/qstate_p.h127
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp3208
-rw-r--r--src/corelib/statemachine/qstatemachine.h199
-rw-r--r--src/corelib/statemachine/qstatemachine_p.h333
-rw-r--r--src/corelib/statemachine/statemachine.pri33
-rw-r--r--src/corelib/text/qanystringview.h303
-rw-r--r--src/corelib/text/qanystringview.qdoc425
-rw-r--r--src/corelib/text/qbytearray.cpp806
-rw-r--r--src/corelib/text/qbytearray.h387
-rw-r--r--src/corelib/text/qbytearraylist.cpp6
-rw-r--r--src/corelib/text/qbytearraylist.h9
-rw-r--r--src/corelib/text/qbytearraymatcher.h8
-rw-r--r--src/corelib/text/qbytearrayview.h25
-rw-r--r--src/corelib/text/qbytearrayview.qdoc43
-rw-r--r--src/corelib/text/qbytedata_p.h49
-rw-r--r--src/corelib/text/qchar.cpp1
-rw-r--r--src/corelib/text/qchar.h186
-rw-r--r--src/corelib/text/qcollator.h6
-rw-r--r--src/corelib/text/qlocale.cpp80
-rw-r--r--src/corelib/text/qlocale.h62
-rw-r--r--src/corelib/text/qlocale_mac.mm28
-rw-r--r--src/corelib/text/qlocale_p.h32
-rw-r--r--src/corelib/text/qlocale_tools.cpp12
-rw-r--r--src/corelib/text/qlocale_tools_p.h4
-rw-r--r--src/corelib/text/qregularexpression.cpp165
-rw-r--r--src/corelib/text/qregularexpression.h140
-rw-r--r--src/corelib/text/qstring.cpp2738
-rw-r--r--src/corelib/text/qstring.h1042
-rw-r--r--src/corelib/text/qstring_compat.cpp112
-rw-r--r--src/corelib/text/qstringalgorithms.h128
-rw-r--r--src/corelib/text/qstringbuilder.cpp13
-rw-r--r--src/corelib/text/qstringbuilder.h81
-rw-r--r--src/corelib/text/qstringconverter.cpp343
-rw-r--r--src/corelib/text/qstringconverter.h70
-rw-r--r--src/corelib/text/qstringconverter_p.h86
-rw-r--r--src/corelib/text/qstringlist.cpp23
-rw-r--r--src/corelib/text/qstringlist.h313
-rw-r--r--src/corelib/text/qstringliteral.h7
-rw-r--r--src/corelib/text/qstringmatcher.cpp49
-rw-r--r--src/corelib/text/qstringmatcher.h30
-rw-r--r--src/corelib/text/qstringtokenizer.cpp81
-rw-r--r--src/corelib/text/qstringtokenizer.h31
-rw-r--r--src/corelib/text/qstringview.cpp63
-rw-r--r--src/corelib/text/qstringview.h230
-rw-r--r--src/corelib/text/qtextboundaryfinder.cpp176
-rw-r--r--src/corelib/text/qtextboundaryfinder.h28
-rw-r--r--src/corelib/text/qunicodetables.cpp36
-rw-r--r--src/corelib/text/qunicodetools.cpp170
-rw-r--r--src/corelib/text/qunicodetools_p.h11
-rw-r--r--src/corelib/text/qutf8stringview.h364
-rw-r--r--src/corelib/text/qutf8stringview.qdoc738
-rw-r--r--src/corelib/text/text.pri8
-rw-r--r--src/corelib/thread/qatomic.cpp56
-rw-r--r--src/corelib/thread/qatomic.h32
-rw-r--r--src/corelib/thread/qatomic_cxx11.h42
-rw-r--r--src/corelib/thread/qatomic_msvc.h28
-rw-r--r--src/corelib/thread/qbasicatomic.h41
-rw-r--r--src/corelib/thread/qexception.cpp16
-rw-r--r--src/corelib/thread/qexception.h16
-rw-r--r--src/corelib/thread/qfutex_p.h4
-rw-r--r--src/corelib/thread/qfuture.h5
-rw-r--r--src/corelib/thread/qfuture.qdoc86
-rw-r--r--src/corelib/thread/qfutureinterface.cpp4
-rw-r--r--src/corelib/thread/qfutureinterface.h80
-rw-r--r--src/corelib/thread/qfuturewatcher.cpp2
-rw-r--r--src/corelib/thread/qfuturewatcher.h8
-rw-r--r--src/corelib/thread/qgenericatomic.h16
-rw-r--r--src/corelib/thread/qmutex.cpp363
-rw-r--r--src/corelib/thread/qmutex.h244
-rw-r--r--src/corelib/thread/qmutex_linux.cpp11
-rw-r--r--src/corelib/thread/qmutex_p.h10
-rw-r--r--src/corelib/thread/qmutex_win.cpp2
-rw-r--r--src/corelib/thread/qorderedmutexlocker_p.h2
-rw-r--r--src/corelib/thread/qpromise.h19
-rw-r--r--src/corelib/thread/qpromise.qdoc44
-rw-r--r--src/corelib/thread/qresultstore.cpp80
-rw-r--r--src/corelib/thread/qresultstore.h50
-rw-r--r--src/corelib/thread/qrunnable.h11
-rw-r--r--src/corelib/thread/qsemaphore.cpp4
-rw-r--r--src/corelib/thread/qsemaphore.h7
-rw-r--r--src/corelib/thread/qthread.cpp24
-rw-r--r--src/corelib/thread/qthread.h12
-rw-r--r--src/corelib/thread/qthread_p.h2
-rw-r--r--src/corelib/thread/qthreadpool.cpp42
-rw-r--r--src/corelib/thread/qthreadpool.h2
-rw-r--r--src/corelib/thread/qwaitcondition_unix.cpp4
-rw-r--r--src/corelib/thread/qwaitcondition_win.cpp4
-rw-r--r--src/corelib/time/qcalendar.cpp117
-rw-r--r--src/corelib/time/qdatetime.cpp901
-rw-r--r--src/corelib/time/qdatetime.h138
-rw-r--r--src/corelib/time/qdatetime_p.h6
-rw-r--r--src/corelib/time/qdatetimeparser.cpp201
-rw-r--r--src/corelib/time/qdatetimeparser_p.h18
-rw-r--r--src/corelib/time/qtimezone.cpp117
-rw-r--r--src/corelib/time/qtimezone.h4
-rw-r--r--src/corelib/time/qtimezoneprivate_p.h8
-rw-r--r--src/corelib/time/qtimezoneprivate_tz.cpp20
-rw-r--r--src/corelib/time/qtimezoneprivate_win.cpp8
-rw-r--r--src/corelib/tools/qalgorithms.h543
-rw-r--r--src/corelib/tools/qalgorithms.qdoc576
-rw-r--r--src/corelib/tools/qarraydata.cpp41
-rw-r--r--src/corelib/tools/qarraydata.h35
-rw-r--r--src/corelib/tools/qarraydataops.h1440
-rw-r--r--src/corelib/tools/qarraydatapointer.h65
-rw-r--r--src/corelib/tools/qbitarray.cpp118
-rw-r--r--src/corelib/tools/qbitarray.h75
-rw-r--r--src/corelib/tools/qcache.h36
-rw-r--r--src/corelib/tools/qcache.qdoc14
-rw-r--r--src/corelib/tools/qcommandlineoption.h2
-rw-r--r--src/corelib/tools/qcontainerfwd.h9
-rw-r--r--src/corelib/tools/qcontainertools_impl.h24
-rw-r--r--src/corelib/tools/qcontiguouscache.h3
-rw-r--r--src/corelib/tools/qcryptographichash.cpp51
-rw-r--r--src/corelib/tools/qduplicatetracker_p.h4
-rw-r--r--src/corelib/tools/qeasingcurve.h3
-rw-r--r--src/corelib/tools/qfreelist_p.h4
-rw-r--r--src/corelib/tools/qhash.cpp191
-rw-r--r--src/corelib/tools/qhash.h33
-rw-r--r--src/corelib/tools/qhashfunctions.h34
-rw-r--r--src/corelib/tools/qiterator.h2
-rw-r--r--src/corelib/tools/qiterator.qdoc389
-rw-r--r--src/corelib/tools/qline.cpp57
-rw-r--r--src/corelib/tools/qline.h165
-rw-r--r--src/corelib/tools/qlist.cpp66
-rw-r--r--src/corelib/tools/qlist.h131
-rw-r--r--src/corelib/tools/qlist.qdoc232
-rw-r--r--src/corelib/tools/qmap.h2176
-rw-r--r--src/corelib/tools/qmap.qdoc (renamed from src/corelib/tools/qmap.cpp)1098
-rw-r--r--src/corelib/tools/qmargins.cpp6
-rw-r--r--src/corelib/tools/qmargins.h222
-rw-r--r--src/corelib/tools/qmessageauthenticationcode.cpp39
-rw-r--r--src/corelib/tools/qmultimap.qdoc1512
-rw-r--r--src/corelib/tools/qoffsetstringarray_p.h9
-rw-r--r--src/corelib/tools/qpoint.cpp14
-rw-r--r--src/corelib/tools/qpoint.h7
-rw-r--r--src/corelib/tools/qqueue.h7
-rw-r--r--src/corelib/tools/qrect.cpp180
-rw-r--r--src/corelib/tools/qrect.h593
-rw-r--r--src/corelib/tools/qringbuffer_p.h6
-rw-r--r--src/corelib/tools/qscopedpointer.cpp4
-rw-r--r--src/corelib/tools/qscopedpointer.h12
-rw-r--r--src/corelib/tools/qscopedpointer_p.h4
-rw-r--r--src/corelib/tools/qscopedvaluerollback.h18
-rw-r--r--src/corelib/tools/qscopeguard.h13
-rw-r--r--src/corelib/tools/qset.h12
-rw-r--r--src/corelib/tools/qset.qdoc271
-rw-r--r--src/corelib/tools/qshareddata.cpp63
-rw-r--r--src/corelib/tools/qshareddata.h317
-rw-r--r--src/corelib/tools/qshareddata_impl.h11
-rw-r--r--src/corelib/tools/qsharedpointer.cpp5
-rw-r--r--src/corelib/tools/qsharedpointer_impl.h43
-rw-r--r--src/corelib/tools/qsize.h214
-rw-r--r--src/corelib/tools/qtimeline.cpp82
-rw-r--r--src/corelib/tools/qtimeline.h20
-rw-r--r--src/corelib/tools/qtools_p.h14
-rw-r--r--src/corelib/tools/qvarlengtharray.h38
-rw-r--r--src/corelib/tools/qvarlengtharray.qdoc6
-rw-r--r--src/corelib/tools/qvector_msvc.cpp51
-rw-r--r--src/corelib/tools/qversionnumber.h51
-rw-r--r--src/corelib/tools/tools.pri5
-rw-r--r--src/dbus/.prev_CMakeLists.txt8
-rw-r--r--src/dbus/CMakeLists.txt8
-rw-r--r--src/dbus/Qt6DBusMacros.cmake22
-rw-r--r--src/dbus/doc/src/qt6-changes.qdoc46
-rw-r--r--src/dbus/doc/src/qtdbus-cmake.qdoc3
-rw-r--r--src/dbus/doc/src/qtdbus-index.qdoc6
-rw-r--r--src/dbus/qdbus_symbols.cpp6
-rw-r--r--src/dbus/qdbusabstractadaptor.cpp4
-rw-r--r--src/dbus/qdbusabstractinterface.cpp147
-rw-r--r--src/dbus/qdbusabstractinterface.h35
-rw-r--r--src/dbus/qdbusargument.cpp17
-rw-r--r--src/dbus/qdbusargument.h38
-rw-r--r--src/dbus/qdbusargument_p.h4
-rw-r--r--src/dbus/qdbusconnection.cpp15
-rw-r--r--src/dbus/qdbusconnection.h5
-rw-r--r--src/dbus/qdbusconnection_p.h13
-rw-r--r--src/dbus/qdbuserror.h2
-rw-r--r--src/dbus/qdbusextratypes.h3
-rw-r--r--src/dbus/qdbusintegrator.cpp48
-rw-r--r--src/dbus/qdbusintegrator_p.h6
-rw-r--r--src/dbus/qdbusinterface.cpp16
-rw-r--r--src/dbus/qdbusinternalfilters.cpp21
-rw-r--r--src/dbus/qdbusmarshaller.cpp48
-rw-r--r--src/dbus/qdbusmessage.cpp12
-rw-r--r--src/dbus/qdbusmessage.h7
-rw-r--r--src/dbus/qdbusmetaobject.cpp30
-rw-r--r--src/dbus/qdbusmetatype.cpp136
-rw-r--r--src/dbus/qdbusmetatype.h36
-rw-r--r--src/dbus/qdbusmetatype_p.h50
-rw-r--r--src/dbus/qdbusmisc.cpp16
-rw-r--r--src/dbus/qdbuspendingcall.cpp8
-rw-r--r--src/dbus/qdbuspendingcall_p.h4
-rw-r--r--src/dbus/qdbuspendingreply.cpp36
-rw-r--r--src/dbus/qdbuspendingreply.h161
-rw-r--r--src/dbus/qdbusreply.cpp12
-rw-r--r--src/dbus/qdbusreply.h5
-rw-r--r--src/dbus/qdbusutil.cpp14
-rw-r--r--src/dbus/qdbusxmlgenerator.cpp28
-rw-r--r--src/dbus/qtdbusglobal.h3
-rw-r--r--src/entrypoint/CMakeLists.txt33
-rw-r--r--src/entrypoint/entrypoint.pro30
-rw-r--r--src/entrypoint/qtentrypoint_win.cpp (renamed from src/winmain/qtmain_win.cpp)4
-rw-r--r--src/gui/.prev_CMakeLists.txt186
-rw-r--r--src/gui/.prev_configure.cmake48
-rw-r--r--src/gui/CMakeLists.txt201
-rw-r--r--src/gui/accessible/linux/.prev_CMakeLists.txt40
-rw-r--r--src/gui/accessible/linux/CMakeLists.txt42
-rw-r--r--src/gui/accessible/linux/atspiadaptor.cpp2
-rw-r--r--src/gui/accessible/linux/linux.pri2
-rw-r--r--src/gui/accessible/qaccessible.cpp12
-rw-r--r--src/gui/accessible/qaccessibleplugin.h1
-rw-r--r--src/gui/configure.cmake62
-rw-r--r--src/gui/configure.json39
-rw-r--r--src/gui/configure.pri37
-rw-r--r--src/gui/doc/QtGuiDoc10
-rw-r--r--src/gui/doc/includes/QtGuiDoc9
-rw-r--r--src/gui/doc/includes/windows.h (renamed from src/concurrent/qtconcurrentexception.h)47
-rw-r--r--src/gui/doc/qtgui.qdocconf13
-rw-r--r--src/gui/doc/snippets/_clang-format2
-rw-r--r--src/gui/doc/snippets/brush/brush.cpp53
-rw-r--r--src/gui/doc/snippets/brush/brush.pro8
-rw-r--r--src/gui/doc/snippets/brush/gradientcreationsnippet.cpp17
-rw-r--r--src/gui/doc/snippets/clipboard/clipboard.pro13
-rw-r--r--src/gui/doc/snippets/clipboard/clipwindow.cpp11
-rw-r--r--src/gui/doc/snippets/code/code.pro48
-rw-r--r--src/gui/doc/snippets/code/doc_src_coordsys.cpp37
-rw-r--r--src/gui/doc/snippets/code/doc_src_richtext.cpp20
-rw-r--r--src/gui/doc/snippets/code/src_gui_accessible_qaccessible.cpp19
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qicon.cpp33
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qimage.cpp25
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qimagereader.cpp16
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qimagewriter.cpp24
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qmovie.cpp14
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qpixmap.cpp18
-rw-r--r--src/gui/doc/snippets/code/src_gui_image_qpixmapcache.cpp19
-rw-r--r--src/gui/doc/snippets/code/src_gui_itemviews_qstandarditemmodel.cpp29
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qaction.cpp (renamed from src/widgets/doc/snippets/code/src_gui_kernel_qaction.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qapplication.cpp53
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qclipboard.cpp16
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qevent.cpp13
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qguiapplication.cpp36
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qguiapplication_x11.cpp12
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qkeysequence.cpp21
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qshortcut.cpp (renamed from src/widgets/doc/snippets/code/src_gui_kernel_qshortcut.cpp)2
-rw-r--r--src/gui/doc/snippets/code/src_gui_kernel_qshortcutmap.cpp9
-rw-r--r--src/gui/doc/snippets/code/src_gui_math3d_qquaternion.cpp22
-rw-r--r--src/gui/doc/snippets/code/src_gui_opengl_qopenglbuffer.cpp16
-rw-r--r--src/gui/doc/snippets/code/src_gui_opengl_qopengldebug.cpp89
-rw-r--r--src/gui/doc/snippets/code/src_gui_opengl_qopenglfunctions.cpp117
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qbrush.cpp13
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qcolor.cpp24
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qpainter.cpp133
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qpainterpath.cpp62
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qpen.cpp27
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qregion.cpp12
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qregion_unix.cpp7
-rw-r--r--src/gui/doc/snippets/code/src_gui_painting_qtransform.cpp6
-rw-r--r--src/gui/doc/snippets/code/src_gui_qopenglshaderprogram.cpp12
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qfont.cpp15
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qfontmetrics.cpp16
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qsyntaxhighlighter.cpp58
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextcursor.cpp22
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextdocument.cpp6
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextdocumentwriter.cpp6
-rw-r--r--src/gui/doc/snippets/code/src_gui_text_qtextlayout.cpp26
-rw-r--r--src/gui/doc/snippets/code/src_gui_util_qdesktopservices.cpp42
-rw-r--r--src/gui/doc/snippets/code/src_gui_util_qundostack.cpp (renamed from src/widgets/doc/snippets/code/src_gui_util_qundostack.cpp)0
-rw-r--r--src/gui/doc/snippets/code/src_gui_util_qvalidator.cpp26
-rw-r--r--src/gui/doc/snippets/code/src_gui_vulkan_qvulkanfunctions.cpp58
-rw-r--r--src/gui/doc/snippets/code/src_gui_vulkan_qvulkaninstance.cpp136
-rw-r--r--src/gui/doc/snippets/code/src_gui_vulkan_qvulkanwindow.cpp136
-rw-r--r--src/gui/doc/snippets/draganddrop/draganddrop.pro14
-rw-r--r--src/gui/doc/snippets/draganddrop/dragwidget.cpp3
-rw-r--r--src/gui/doc/snippets/draganddrop/mainwindow.cpp2
-rw-r--r--src/gui/doc/snippets/droparea.cpp150
-rw-r--r--src/gui/doc/snippets/droparea/droparea.cpp (renamed from src/corelib/doc/snippets/statemachine/eventtest.cpp)54
-rw-r--r--src/gui/doc/snippets/droparea/droparea.pro6
-rw-r--r--src/gui/doc/snippets/dropevents/dropevents.pro9
-rw-r--r--src/gui/doc/snippets/dropevents/main.cpp62
-rw-r--r--src/gui/doc/snippets/dropevents/window.cpp27
-rw-r--r--src/gui/doc/snippets/dropevents/window.h81
-rw-r--r--src/gui/doc/snippets/droprectangle/droprectangle.pro9
-rw-r--r--src/gui/doc/snippets/droprectangle/main.cpp61
-rw-r--r--src/gui/doc/snippets/droprectangle/window.cpp50
-rw-r--r--src/gui/doc/snippets/droprectangle/window.h81
-rw-r--r--src/gui/doc/snippets/image/image.cpp78
-rw-r--r--src/gui/doc/snippets/image/image.pro8
-rw-r--r--src/gui/doc/snippets/image/supportedformat.cpp7
-rw-r--r--src/gui/doc/snippets/matrix/matrix.cpp150
-rw-r--r--src/gui/doc/snippets/overview/using-qt-gui.cmake4
-rw-r--r--src/gui/doc/snippets/picture/picture.cpp48
-rw-r--r--src/gui/doc/snippets/picture/picture.pro7
-rw-r--r--src/gui/doc/snippets/plaintextlayout/plaintextlayout.pro9
-rw-r--r--src/gui/doc/snippets/plaintextlayout/window.cpp99
-rw-r--r--src/gui/doc/snippets/plaintextlayout/window.h71
-rw-r--r--src/gui/doc/snippets/polygon/polygon.cpp96
-rw-r--r--src/gui/doc/snippets/polygon/polygon.pro7
-rw-r--r--src/gui/doc/snippets/qfileopenevent/main.cpp3
-rw-r--r--src/gui/doc/snippets/qfileopenevent/qfileopenevent.pro7
-rw-r--r--src/gui/doc/snippets/qfontdatabase/main.cpp87
-rw-r--r--src/gui/doc/snippets/qfontdatabase/qfontdatabase.pro5
-rw-r--r--src/gui/doc/snippets/qfontdatabase/qfontdatabase_snippets.cpp (renamed from src/gui/doc/snippets/textdocument-frames/xmlwriter.h)44
-rw-r--r--src/gui/doc/snippets/qimagewriter/main.cpp27
-rw-r--r--src/gui/doc/snippets/qimagewriter/qimagewriter.pro7
-rw-r--r--src/gui/doc/snippets/qstatustipevent/main.cpp5
-rw-r--r--src/gui/doc/snippets/qstatustipevent/qstatustipevent.pro7
-rw-r--r--src/gui/doc/snippets/qtextobject/qtextobject.pro7
-rw-r--r--src/gui/doc/snippets/qtextobject/textobjectinterface.h3
-rw-r--r--src/gui/doc/snippets/scribe-overview/main.cpp32
-rw-r--r--src/gui/doc/snippets/scribe-overview/scribe-overview.pro7
-rw-r--r--src/gui/doc/snippets/separations/finalwidget.cpp17
-rw-r--r--src/gui/doc/snippets/separations/finalwidget.h2
-rw-r--r--src/gui/doc/snippets/separations/separations.pro20
-rw-r--r--src/gui/doc/snippets/separations/viewer.cpp3
-rw-r--r--src/gui/doc/snippets/snippets.pro45
-rw-r--r--src/gui/doc/snippets/textblock-formats/main.cpp6
-rw-r--r--src/gui/doc/snippets/textblock-formats/textblock-formats.pro8
-rw-r--r--src/gui/doc/snippets/textblock-fragments/main.cpp62
-rw-r--r--src/gui/doc/snippets/textblock-fragments/mainwindow.cpp158
-rw-r--r--src/gui/doc/snippets/textblock-fragments/textblock-fragments.pro14
-rw-r--r--src/gui/doc/snippets/textblock-fragments/xmlwriter.cpp12
-rw-r--r--src/gui/doc/snippets/textblock-fragments/xmlwriter.h1
-rw-r--r--src/gui/doc/snippets/textdocument-blocks/main.cpp7
-rw-r--r--src/gui/doc/snippets/textdocument-blocks/mainwindow.cpp16
-rw-r--r--src/gui/doc/snippets/textdocument-blocks/textdocument-blocks.pro16
-rw-r--r--src/gui/doc/snippets/textdocument-blocks/xmlwriter.cpp94
-rw-r--r--src/gui/doc/snippets/textdocument-blocks/xmlwriter.h71
-rw-r--r--src/gui/doc/snippets/textdocument-charformats/main.cpp4
-rw-r--r--src/gui/doc/snippets/textdocument-charformats/textdocument-charformats.pro7
-rw-r--r--src/gui/doc/snippets/textdocument-css/main.cpp4
-rw-r--r--src/gui/doc/snippets/textdocument-css/textdocument-css.pro5
-rw-r--r--src/gui/doc/snippets/textdocument-cursors/main.cpp4
-rw-r--r--src/gui/doc/snippets/textdocument-cursors/textdocument-cursors.pro7
-rw-r--r--src/gui/doc/snippets/textdocument-end/textdocument-end.pro5
-rw-r--r--src/gui/doc/snippets/textdocument-end/textdocumentendsnippet.cpp (renamed from src/gui/doc/snippets/textdocumentendsnippet.cpp)14
-rw-r--r--src/gui/doc/snippets/textdocument-find/main.cpp4
-rw-r--r--src/gui/doc/snippets/textdocument-find/textdocument-find.pro7
-rw-r--r--src/gui/doc/snippets/textdocument-frames/main.cpp4
-rw-r--r--src/gui/doc/snippets/textdocument-frames/mainwindow.cpp15
-rw-r--r--src/gui/doc/snippets/textdocument-frames/mainwindow.h2
-rw-r--r--src/gui/doc/snippets/textdocument-frames/textdocument-frames.pro16
-rw-r--r--src/gui/doc/snippets/textdocument-frames/xmlwriter.cpp128
-rw-r--r--src/gui/doc/snippets/textdocument-imagedrop/main.cpp9
-rw-r--r--src/gui/doc/snippets/textdocument-imagedrop/textdocument-imagedrop.pro10
-rw-r--r--src/gui/doc/snippets/textdocument-imageformat/main.cpp5
-rw-r--r--src/gui/doc/snippets/textdocument-imageformat/textdocument-imageformat.pro11
-rw-r--r--src/gui/doc/snippets/textdocument-images/main.cpp4
-rw-r--r--src/gui/doc/snippets/textdocument-images/textdocument-images.pro11
-rw-r--r--src/gui/doc/snippets/textdocument-listitems/main.cpp2
-rw-r--r--src/gui/doc/snippets/textdocument-listitems/mainwindow.cpp13
-rw-r--r--src/gui/doc/snippets/textdocument-listitems/mainwindow.h4
-rw-r--r--src/gui/doc/snippets/textdocument-listitems/textdocument-listitems.pro13
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/main.cpp1
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.cpp7
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/mainwindow.h4
-rw-r--r--src/gui/doc/snippets/textdocument-listitemstyles/textdocument-listitemstyles.pro13
-rw-r--r--src/gui/doc/snippets/textdocument-lists/mainwindow.cpp144
-rw-r--r--src/gui/doc/snippets/textdocument-lists/textdocument-lists.pro6
-rw-r--r--src/gui/doc/snippets/textdocument-printing/main.cpp5
-rw-r--r--src/gui/doc/snippets/textdocument-printing/mainwindow.cpp10
-rw-r--r--src/gui/doc/snippets/textdocument-printing/mainwindow.h9
-rw-r--r--src/gui/doc/snippets/textdocument-printing/textdocument-printing.pro13
-rw-r--r--src/gui/doc/snippets/textdocument-resources/main.cpp4
-rw-r--r--src/gui/doc/snippets/textdocument-resources/textdocument-resources.pro7
-rw-r--r--src/gui/doc/snippets/textdocument-selections/main.cpp5
-rw-r--r--src/gui/doc/snippets/textdocument-selections/mainwindow.cpp6
-rw-r--r--src/gui/doc/snippets/textdocument-selections/mainwindow.h10
-rw-r--r--src/gui/doc/snippets/textdocument-selections/textdocument-selections.pro14
-rw-r--r--src/gui/doc/snippets/textdocument-tables/main.cpp5
-rw-r--r--src/gui/doc/snippets/textdocument-tables/mainwindow.cpp22
-rw-r--r--src/gui/doc/snippets/textdocument-tables/mainwindow.h3
-rw-r--r--src/gui/doc/snippets/textdocument-tables/textdocument-tables.pro16
-rw-r--r--src/gui/doc/snippets/textdocument-tables/xmlwriter.cpp165
-rw-r--r--src/gui/doc/snippets/textdocument-tables/xmlwriter.h74
-rw-r--r--src/gui/doc/snippets/textdocument-texttable/main.cpp5
-rw-r--r--src/gui/doc/snippets/textdocument-texttable/textdocument-texttable.pro6
-rw-r--r--src/gui/doc/snippets/transform/main.cpp6
-rw-r--r--src/gui/doc/snippets/transform/transform.pro6
-rw-r--r--src/gui/doc/src/coordsys.qdoc2
-rw-r--r--src/gui/doc/src/dnd.qdoc2
-rw-r--r--src/gui/doc/src/qt6-changes.qdoc46
-rw-r--r--src/gui/doc/src/qtgui.qdoc8
-rw-r--r--src/gui/gui.pro5
-rw-r--r--src/gui/image/image.pri7
-rw-r--r--src/gui/image/qabstractfileiconprovider.cpp219
-rw-r--r--src/gui/image/qabstractfileiconprovider.h (renamed from src/gui/platform/windows/qwindowsplatforminterface.cpp)58
-rw-r--r--src/gui/image/qabstractfileiconprovider_p.h (renamed from src/corelib/statemachine/qeventtransition_p.h)37
-rw-r--r--src/gui/image/qbitmap.cpp118
-rw-r--r--src/gui/image/qbitmap.h17
-rw-r--r--src/gui/image/qbmphandler.cpp2
-rw-r--r--src/gui/image/qicon.cpp169
-rw-r--r--src/gui/image/qicon.h16
-rw-r--r--src/gui/image/qicon_p.h2
-rw-r--r--src/gui/image/qiconengine.cpp73
-rw-r--r--src/gui/image/qiconengine.h20
-rw-r--r--src/gui/image/qiconloader.cpp84
-rw-r--r--src/gui/image/qiconloader_p.h6
-rw-r--r--src/gui/image/qimage.cpp142
-rw-r--r--src/gui/image/qimage.h38
-rw-r--r--src/gui/image/qimage_conversions.cpp113
-rw-r--r--src/gui/image/qimage_darwin.mm7
-rw-r--r--src/gui/image/qimage_p.h3
-rw-r--r--src/gui/image/qimageiohandler.cpp9
-rw-r--r--src/gui/image/qimagereader.cpp2
-rw-r--r--src/gui/image/qimagereader.h1
-rw-r--r--src/gui/image/qpaintengine_pic.cpp4
-rw-r--r--src/gui/image/qpicture.cpp10
-rw-r--r--src/gui/image/qpicture.h3
-rw-r--r--src/gui/image/qpixmap.cpp12
-rw-r--r--src/gui/image/qpixmap.h7
-rw-r--r--src/gui/image/qpixmap_win.cpp23
-rw-r--r--src/gui/image/qpnghandler.cpp25
-rw-r--r--src/gui/image/qppmhandler.cpp9
-rw-r--r--src/gui/image/qxbmhandler.cpp9
-rw-r--r--src/gui/image/qxpmhandler.cpp27
-rw-r--r--src/gui/itemmodels/itemmodels.pri23
-rw-r--r--src/gui/itemmodels/qfileinfogatherer.cpp (renamed from src/widgets/dialogs/qfileinfogatherer.cpp)4
-rw-r--r--src/gui/itemmodels/qfileinfogatherer_p.h (renamed from src/widgets/dialogs/qfileinfogatherer_p.h)14
-rw-r--r--src/gui/itemmodels/qfilesystemmodel.cpp (renamed from src/widgets/dialogs/qfilesystemmodel.cpp)72
-rw-r--r--src/gui/itemmodels/qfilesystemmodel.h (renamed from src/widgets/dialogs/qfilesystemmodel.h)10
-rw-r--r--src/gui/itemmodels/qfilesystemmodel_p.h (renamed from src/widgets/dialogs/qfilesystemmodel_p.h)8
-rw-r--r--src/gui/itemmodels/qstandarditemmodel.cpp40
-rw-r--r--src/gui/itemmodels/qstandarditemmodel.h3
-rw-r--r--src/gui/kernel/kernel.pri5
-rw-r--r--src/gui/kernel/qaction.cpp151
-rw-r--r--src/gui/kernel/qaction.h3
-rw-r--r--src/gui/kernel/qaction_p.h7
-rw-r--r--src/gui/kernel/qactiongroup.cpp12
-rw-r--r--src/gui/kernel/qclipboard.cpp4
-rw-r--r--src/gui/kernel/qcursor.cpp2
-rw-r--r--src/gui/kernel/qcursor.h15
-rw-r--r--src/gui/kernel/qevent.cpp1084
-rw-r--r--src/gui/kernel/qevent.h203
-rw-r--r--src/gui/kernel/qevent_p.h124
-rw-r--r--src/gui/kernel/qguiapplication.cpp605
-rw-r--r--src/gui/kernel/qguiapplication.h3
-rw-r--r--src/gui/kernel/qguiapplication_p.h40
-rw-r--r--src/gui/kernel/qguistatemachine.cpp (renamed from src/widgets/statemachine/qguistatemachine.cpp)140
-rw-r--r--src/gui/kernel/qguivariant.cpp291
-rw-r--r--src/gui/kernel/qhighdpiscaling.cpp57
-rw-r--r--src/gui/kernel/qhighdpiscaling_p.h14
-rw-r--r--src/gui/kernel/qinputdevice.cpp71
-rw-r--r--src/gui/kernel/qinternalmimedata.cpp14
-rw-r--r--src/gui/kernel/qinternalmimedata_p.h4
-rw-r--r--src/gui/kernel/qkeymapper.cpp24
-rw-r--r--src/gui/kernel/qkeymapper_p.h13
-rw-r--r--src/gui/kernel/qkeysequence.cpp29
-rw-r--r--src/gui/kernel/qkeysequence.h10
-rw-r--r--src/gui/kernel/qkeysequence_p.h2
-rw-r--r--src/gui/kernel/qoffscreensurface.cpp87
-rw-r--r--src/gui/kernel/qoffscreensurface.h11
-rw-r--r--src/gui/kernel/qoffscreensurface_p.h (renamed from src/corelib/statemachine/qsignaltransition_p.h)54
-rw-r--r--src/gui/kernel/qoffscreensurface_platform.h (renamed from src/widgets/widgets/qmacnativewidget_mac.h)40
-rw-r--r--src/gui/kernel/qopenglcontext.cpp14
-rw-r--r--src/gui/kernel/qopenglcontext.h3
-rw-r--r--src/gui/kernel/qopenglcontext_platform.h26
-rw-r--r--src/gui/kernel/qpaintdevicewindow.cpp20
-rw-r--r--src/gui/kernel/qpaintdevicewindow.h4
-rw-r--r--src/gui/kernel/qpalette.cpp69
-rw-r--r--src/gui/kernel/qpalette.h35
-rw-r--r--src/gui/kernel/qpixelformat.h167
-rw-r--r--src/gui/kernel/qplatformdialoghelper.cpp10
-rw-r--r--src/gui/kernel/qplatformdialoghelper.h4
-rw-r--r--src/gui/kernel/qplatformintegration.cpp18
-rw-r--r--src/gui/kernel/qplatformintegration.h10
-rw-r--r--src/gui/kernel/qplatformmenu_p.h16
-rw-r--r--src/gui/kernel/qplatformoffscreensurface.h25
-rw-r--r--src/gui/kernel/qplatformopenglcontext.h18
-rw-r--r--src/gui/kernel/qplatformscreen.cpp36
-rw-r--r--src/gui/kernel/qplatformscreen.h1
-rw-r--r--src/gui/kernel/qplatformscreen_p.h14
-rw-r--r--src/gui/kernel/qplatformtheme.cpp2
-rw-r--r--src/gui/kernel/qplatformtheme.h5
-rw-r--r--src/gui/kernel/qplatformwindow_p.h18
-rw-r--r--src/gui/kernel/qpointingdevice.cpp285
-rw-r--r--src/gui/kernel/qpointingdevice.h21
-rw-r--r--src/gui/kernel/qpointingdevice_p.h34
-rw-r--r--src/gui/kernel/qscreen.cpp8
-rw-r--r--src/gui/kernel/qsessionmanager.cpp3
-rw-r--r--src/gui/kernel/qshapedpixmapdndwindow.cpp2
-rw-r--r--src/gui/kernel/qshortcut.cpp47
-rw-r--r--src/gui/kernel/qshortcutmap.cpp16
-rw-r--r--src/gui/kernel/qsurfaceformat.cpp69
-rw-r--r--src/gui/kernel/qsurfaceformat.h17
-rw-r--r--src/gui/kernel/qtestsupport_gui.cpp81
-rw-r--r--src/gui/kernel/qtestsupport_gui.h45
-rw-r--r--src/gui/kernel/qwindow.cpp47
-rw-r--r--src/gui/kernel/qwindow.h8
-rw-r--r--src/gui/kernel/qwindowsysteminterface.cpp106
-rw-r--r--src/gui/kernel/qwindowsysteminterface.h17
-rw-r--r--src/gui/kernel/qwindowsysteminterface_p.h12
-rw-r--r--src/gui/math3d/qgenericmatrix.h10
-rw-r--r--src/gui/math3d/qmatrix4x4.cpp30
-rw-r--r--src/gui/math3d/qmatrix4x4.h27
-rw-r--r--src/gui/math3d/qquaternion.cpp9
-rw-r--r--src/gui/math3d/qquaternion.h18
-rw-r--r--src/gui/math3d/qvector2d.cpp32
-rw-r--r--src/gui/math3d/qvector2d.h78
-rw-r--r--src/gui/math3d/qvector3d.cpp34
-rw-r--r--src/gui/math3d/qvector3d.h78
-rw-r--r--src/gui/math3d/qvector4d.cpp35
-rw-r--r--src/gui/math3d/qvector4d.h86
-rw-r--r--src/gui/opengl/platform/egl/qeglplatformcontext_p.h2
-rw-r--r--src/gui/opengl/platform/unix/qglxconvenience.cpp23
-rw-r--r--src/gui/opengl/platform/unix/unix.pri2
-rw-r--r--src/gui/opengl/qopenglfunctions.cpp7
-rw-r--r--src/gui/opengl/qopenglfunctions.h6
-rw-r--r--src/gui/painting/qbackingstore.cpp7
-rw-r--r--src/gui/painting/qbezier.cpp4
-rw-r--r--src/gui/painting/qbrush.cpp66
-rw-r--r--src/gui/painting/qbrush.h12
-rw-r--r--src/gui/painting/qcolor.cpp404
-rw-r--r--src/gui/painting/qcolor.h423
-rw-r--r--src/gui/painting/qcolormatrix_p.h12
-rw-r--r--src/gui/painting/qcolorspace.cpp95
-rw-r--r--src/gui/painting/qcolorspace.h26
-rw-r--r--src/gui/painting/qcolorspace_p.h18
-rw-r--r--src/gui/painting/qcolortransfertable_p.h47
-rw-r--r--src/gui/painting/qcolortransform.cpp14
-rw-r--r--src/gui/painting/qcolortransform.h16
-rw-r--r--src/gui/painting/qcompositionfunctions.cpp34
-rw-r--r--src/gui/painting/qcoregraphics.mm6
-rw-r--r--src/gui/painting/qcosmeticstroker.cpp2
-rw-r--r--src/gui/painting/qcssutil.cpp2
-rw-r--r--src/gui/painting/qdatabuffer_p.h3
-rw-r--r--src/gui/painting/qdrawhelper.cpp2
-rw-r--r--src/gui/painting/qdrawhelper_p.h10
-rw-r--r--src/gui/painting/qdrawingprimitive_sse2_p.h2
-rw-r--r--src/gui/painting/qemulationpaintengine.cpp4
-rw-r--r--src/gui/painting/qfixed_p.h136
-rw-r--r--src/gui/painting/qgrayraster.c156
-rw-r--r--src/gui/painting/qicc.cpp194
-rw-r--r--src/gui/painting/qimagescale.cpp2
-rw-r--r--src/gui/painting/qimagescale_neon.cpp2
-rw-r--r--src/gui/painting/qimagescale_sse4.cpp2
-rw-r--r--src/gui/painting/qoutlinemapper.cpp2
-rw-r--r--src/gui/painting/qpagedpaintdevice.cpp314
-rw-r--r--src/gui/painting/qpagedpaintdevice.h183
-rw-r--r--src/gui/painting/qpagelayout.h3
-rw-r--r--src/gui/painting/qpagesize.cpp12
-rw-r--r--src/gui/painting/qpagesize.h18
-rw-r--r--src/gui/painting/qpaintdevice.h4
-rw-r--r--src/gui/painting/qpaintdevice.qdoc4
-rw-r--r--src/gui/painting/qpaintengine.cpp43
-rw-r--r--src/gui/painting/qpaintengine.h4
-rw-r--r--src/gui/painting/qpaintengine_raster.cpp42
-rw-r--r--src/gui/painting/qpaintengineex.cpp4
-rw-r--r--src/gui/painting/qpainter.cpp6
-rw-r--r--src/gui/painting/qpainterpath.cpp34
-rw-r--r--src/gui/painting/qpainterpath.h21
-rw-r--r--src/gui/painting/qpainterpath_p.h125
-rw-r--r--src/gui/painting/qpdf.cpp4
-rw-r--r--src/gui/painting/qpdf_p.h3
-rw-r--r--src/gui/painting/qpdfwriter.cpp156
-rw-r--r--src/gui/painting/qpdfwriter.h20
-rw-r--r--src/gui/painting/qpen.cpp2
-rw-r--r--src/gui/painting/qpen.h5
-rw-r--r--src/gui/painting/qpixellayout.cpp370
-rw-r--r--src/gui/painting/qpixellayout_p.h4
-rw-r--r--src/gui/painting/qpolygon.cpp51
-rw-r--r--src/gui/painting/qpolygon.h96
-rw-r--r--src/gui/painting/qrangecollection.cpp10
-rw-r--r--src/gui/painting/qrasterizer.cpp97
-rw-r--r--src/gui/painting/qregion.cpp4
-rw-r--r--src/gui/painting/qregion.h23
-rw-r--r--src/gui/painting/qrgb.h22
-rw-r--r--src/gui/painting/qrgba64.h66
-rw-r--r--src/gui/painting/qstroker_p.h6
-rw-r--r--src/gui/painting/qtransform.cpp2
-rw-r--r--src/gui/painting/qtransform.h6
-rw-r--r--src/gui/painting/qtriangulatingstroker.cpp2
-rw-r--r--src/gui/painting/webgradients.cpp10
-rw-r--r--src/gui/platform/android/android.pri1
-rw-r--r--src/gui/platform/android/qandroidnativeinterface.cpp (renamed from src/gui/platform/macos/qcocoaplatforminterface.mm)37
-rw-r--r--src/gui/platform/darwin/qmacmime.mm30
-rw-r--r--src/gui/platform/macos/macos.pri2
-rw-r--r--src/gui/platform/macos/qcocoanativeinterface.mm (renamed from src/gui/platform/unix/qunixplatforminterface.cpp)101
-rw-r--r--src/gui/platform/platform.pri1
-rw-r--r--src/gui/platform/unix/dbusmenu/qdbusmenutypes.cpp2
-rw-r--r--src/gui/platform/unix/dbustray/qdbustrayicon.cpp3
-rw-r--r--src/gui/platform/unix/dbustray/qdbustraytypes.cpp18
-rw-r--r--src/gui/platform/unix/qgenericunixthemes.cpp4
-rw-r--r--src/gui/platform/unix/qunixeventdispatcher.cpp12
-rw-r--r--src/gui/platform/unix/qunixeventdispatcher_qpa_p.h3
-rw-r--r--src/gui/platform/unix/qunixnativeinterface.cpp207
-rw-r--r--src/gui/platform/unix/qxkbcommon.cpp7
-rw-r--r--src/gui/platform/unix/unix.pri4
-rw-r--r--src/gui/platform/windows/qwindowsguieventdispatcher.cpp1
-rw-r--r--src/gui/platform/windows/qwindowsguieventdispatcher_p.h2
-rw-r--r--src/gui/platform/windows/qwindowsmime_p.h17
-rw-r--r--src/gui/platform/windows/qwindowsnativeinterface.cpp321
-rw-r--r--src/gui/platform/windows/windows.pri2
-rw-r--r--src/gui/qt_cmdline.cmake35
-rw-r--r--src/gui/qtgui.tracepoints2
-rw-r--r--src/gui/rhi/qrhi.cpp646
-rw-r--r--src/gui/rhi/qrhi_p.h134
-rw-r--r--src/gui/rhi/qrhi_p_p.h163
-rw-r--r--src/gui/rhi/qrhid3d11.cpp583
-rw-r--r--src/gui/rhi/qrhid3d11_p_p.h51
-rw-r--r--src/gui/rhi/qrhigles2.cpp817
-rw-r--r--src/gui/rhi/qrhigles2_p_p.h87
-rw-r--r--src/gui/rhi/qrhimetal.mm76
-rw-r--r--src/gui/rhi/qrhimetal_p_p.h9
-rw-r--r--src/gui/rhi/qrhinull.cpp47
-rw-r--r--src/gui/rhi/qrhinull_p_p.h10
-rw-r--r--src/gui/rhi/qrhiprofiler.cpp1
-rw-r--r--src/gui/rhi/qrhivulkan.cpp728
-rw-r--r--src/gui/rhi/qrhivulkan_p.h3
-rw-r--r--src/gui/rhi/qrhivulkan_p_p.h63
-rw-r--r--src/gui/rhi/qshader.cpp21
-rw-r--r--src/gui/rhi/qshader_p.h24
-rw-r--r--src/gui/rhi/qshaderdescription.cpp239
-rw-r--r--src/gui/rhi/qshaderdescription_p.h30
-rw-r--r--src/gui/rhi/qshaderdescription_p_p.h1
-rw-r--r--src/gui/text/freetype/qfreetypefontdatabase.cpp2
-rw-r--r--src/gui/text/qcssparser.cpp32
-rw-r--r--src/gui/text/qfont.cpp171
-rw-r--r--src/gui/text/qfont.h31
-rw-r--r--src/gui/text/qfont_p.h37
-rw-r--r--src/gui/text/qfontdatabase.cpp77
-rw-r--r--src/gui/text/qfontdatabase.h42
-rw-r--r--src/gui/text/qfontdatabase_p.h13
-rw-r--r--src/gui/text/qfontengine.cpp10
-rw-r--r--src/gui/text/qfontengine_p.h9
-rw-r--r--src/gui/text/qfontengine_qpf2.cpp626
-rw-r--r--src/gui/text/qfontengine_qpf2_p.h241
-rw-r--r--src/gui/text/qfontmetrics.h6
-rw-r--r--src/gui/text/qfontsubset.cpp8
-rw-r--r--src/gui/text/qfontsubset_p.h8
-rw-r--r--src/gui/text/qglyphrun.h2
-rw-r--r--src/gui/text/qharfbuzzng_p.h2
-rw-r--r--src/gui/text/qplatformfontdatabase.cpp109
-rw-r--r--src/gui/text/qplatformfontdatabase.h5
-rw-r--r--src/gui/text/qrawfont.cpp8
-rw-r--r--src/gui/text/qrawfont.h2
-rw-r--r--src/gui/text/qstatictext.cpp4
-rw-r--r--src/gui/text/qstatictext.h2
-rw-r--r--src/gui/text/qstatictext_p.h1
-rw-r--r--src/gui/text/qtextcursor.h2
-rw-r--r--src/gui/text/qtextdocument.cpp105
-rw-r--r--src/gui/text/qtextdocument.h9
-rw-r--r--src/gui/text/qtextdocumentfragment.cpp9
-rw-r--r--src/gui/text/qtextengine.cpp16
-rw-r--r--src/gui/text/qtextengine_p.h4
-rw-r--r--src/gui/text/qtextformat.cpp90
-rw-r--r--src/gui/text/qtextformat.h23
-rw-r--r--src/gui/text/qtextformat_p.h7
-rw-r--r--src/gui/text/qtexthtmlparser.cpp55
-rw-r--r--src/gui/text/qtexthtmlparser_p.h10
-rw-r--r--src/gui/text/qtextimagehandler.cpp4
-rw-r--r--src/gui/text/qtextlayout.cpp71
-rw-r--r--src/gui/text/qtextlayout.h9
-rw-r--r--src/gui/text/qtextlist.cpp14
-rw-r--r--src/gui/text/qtextlist.h6
-rw-r--r--src/gui/text/qtextobject.cpp6
-rw-r--r--src/gui/text/qtextobject.h4
-rw-r--r--src/gui/text/qtextodfwriter.cpp8
-rw-r--r--src/gui/text/qtextoption.cpp4
-rw-r--r--src/gui/text/qtextoption.h2
-rw-r--r--src/gui/text/qtexttable.cpp4
-rw-r--r--src/gui/text/text.pri1
-rw-r--r--src/gui/text/unix/qfontconfigdatabase.cpp9
-rw-r--r--src/gui/text/windows/qwindowsdirectwritefontdatabase.cpp2
-rw-r--r--src/gui/text/windows/qwindowsfontdatabase.cpp26
-rw-r--r--src/gui/text/windows/qwindowsfontdatabase_ft.cpp8
-rw-r--r--src/gui/text/windows/qwindowsfontdatabase_p.h2
-rw-r--r--src/gui/text/windows/qwindowsfontdatabasebase.cpp8
-rw-r--r--src/gui/text/windows/qwindowsfontengine.cpp4
-rw-r--r--src/gui/text/windows/qwindowsfontengine_p.h2
-rw-r--r--src/gui/util/qdesktopservices.cpp1
-rw-r--r--src/gui/util/qdesktopservices.h1
-rw-r--r--src/gui/util/qktxhandler.cpp1
-rw-r--r--src/gui/util/qshaderformat.cpp4
-rw-r--r--src/gui/util/qshaderformat_p.h4
-rw-r--r--src/gui/util/qshadergraphloader.cpp18
-rw-r--r--src/gui/util/qshadernodesloader.cpp16
-rw-r--r--src/gui/vulkan/qvulkaninstance.h27
-rw-r--r--src/gui/vulkan/qvulkanwindow.cpp14
-rw-r--r--src/gui/vulkan/qvulkanwindow.h1
-rw-r--r--src/network/.prev_CMakeLists.txt128
-rw-r--r--src/network/CMakeLists.txt136
-rw-r--r--src/network/access/access.pri31
-rw-r--r--src/network/access/http2/huffman.cpp6
-rw-r--r--src/network/access/qabstractnetworkcache.cpp20
-rw-r--r--src/network/access/qdecompresshelper.cpp739
-rw-r--r--src/network/access/qdecompresshelper_p.h136
-rw-r--r--src/network/access/qftp.cpp2456
-rw-r--r--src/network/access/qftp_p.h176
-rw-r--r--src/network/access/qhttp2configuration.cpp12
-rw-r--r--src/network/access/qhttp2protocolhandler.cpp24
-rw-r--r--src/network/access/qhttpmultipart.h2
-rw-r--r--src/network/access/qhttpmultipart_p.h2
-rw-r--r--src/network/access/qhttpnetworkconnection.cpp39
-rw-r--r--src/network/access/qhttpnetworkconnectionchannel.cpp48
-rw-r--r--src/network/access/qhttpnetworkheader_p.h2
-rw-r--r--src/network/access/qhttpnetworkreply.cpp149
-rw-r--r--src/network/access/qhttpnetworkreply_p.h16
-rw-r--r--src/network/access/qhttpnetworkrequest.cpp13
-rw-r--r--src/network/access/qhttpnetworkrequest_p.h6
-rw-r--r--src/network/access/qhttpprotocolhandler.cpp46
-rw-r--r--src/network/access/qhttpprotocolhandler_p.h4
-rw-r--r--src/network/access/qnetworkaccessauthenticationmanager_p.h1
-rw-r--r--src/network/access/qnetworkaccessbackend.cpp634
-rw-r--r--src/network/access/qnetworkaccessbackend_p.h222
-rw-r--r--src/network/access/qnetworkaccesscachebackend.cpp30
-rw-r--r--src/network/access/qnetworkaccesscachebackend_p.h9
-rw-r--r--src/network/access/qnetworkaccessdebugpipebackend.cpp89
-rw-r--r--src/network/access/qnetworkaccessdebugpipebackend_p.h8
-rw-r--r--src/network/access/qnetworkaccessfilebackend.cpp84
-rw-r--r--src/network/access/qnetworkaccessfilebackend_p.h8
-rw-r--r--src/network/access/qnetworkaccessftpbackend.cpp436
-rw-r--r--src/network/access/qnetworkaccessftpbackend_p.h126
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp116
-rw-r--r--src/network/access/qnetworkaccessmanager.h5
-rw-r--r--src/network/access/qnetworkaccessmanager_p.h10
-rw-r--r--src/network/access/qnetworkreply.cpp10
-rw-r--r--src/network/access/qnetworkreplyhttpimpl.cpp20
-rw-r--r--src/network/access/qnetworkreplyimpl.cpp116
-rw-r--r--src/network/access/qnetworkreplyimpl_p.h6
-rw-r--r--src/network/access/qnetworkreplywasmimpl.cpp19
-rw-r--r--src/network/access/qnetworkreplywasmimpl_p.h1
-rw-r--r--src/network/access/qnetworkrequest.cpp35
-rw-r--r--src/network/access/qnetworkrequest.h3
-rw-r--r--src/network/android/jar/CMakeLists.txt6
-rw-r--r--src/network/android/jar/jar.pro4
-rw-r--r--src/network/android/jar/src/org/qtproject/qt/android/network/QtNetwork.java (renamed from src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java)2
-rw-r--r--src/network/configure.cmake22
-rw-r--r--src/network/configure.json36
-rw-r--r--src/network/doc/snippets/code/src_network_access_qftp.cpp109
-rw-r--r--src/network/doc/snippets/code/src_network_socket_qabstractsocket.cpp14
-rw-r--r--src/network/doc/snippets/network/network.pro6
-rw-r--r--src/network/doc/snippets/snippets.pro14
-rw-r--r--src/network/doc/src/examples.qdoc1
-rw-r--r--src/network/doc/src/network-programming.qdoc4
-rw-r--r--src/network/doc/src/qt6-changes.qdoc187
-rw-r--r--src/network/doc/src/qtnetwork.qdoc6
-rw-r--r--src/network/kernel/kernel.pri7
-rw-r--r--src/network/kernel/qauthenticator.cpp143
-rw-r--r--src/network/kernel/qauthenticator_p.h2
-rw-r--r--src/network/kernel/qhostaddress_p.h2
-rw-r--r--src/network/kernel/qhostinfo.cpp34
-rw-r--r--src/network/kernel/qhostinfo.h10
-rw-r--r--src/network/kernel/qnetconmonitor_win.cpp16
-rw-r--r--src/network/kernel/qnetworkinterface_linux.cpp3
-rw-r--r--src/network/kernel/qnetworkinterface_unix.cpp4
-rw-r--r--src/network/kernel/qnetworkproxy_android.cpp2
-rw-r--r--src/network/kernel/qtldurl.cpp2
-rw-r--r--src/network/kernel/qurlinfo.cpp727
-rw-r--r--src/network/kernel/qurlinfo_p.h133
-rw-r--r--src/network/network.pro3
-rw-r--r--src/network/qt_cmdline.cmake12
-rw-r--r--src/network/socket/qabstractsocket.cpp63
-rw-r--r--src/network/socket/qabstractsocket.h11
-rw-r--r--src/network/socket/qabstractsocket_p.h3
-rw-r--r--src/network/socket/qhttpsocketengine.cpp2
-rw-r--r--src/network/socket/qlocalsocket.cpp8
-rw-r--r--src/network/socket/qlocalsocket.h1
-rw-r--r--src/network/socket/qlocalsocket_p.h2
-rw-r--r--src/network/socket/qlocalsocket_tcp.cpp10
-rw-r--r--src/network/socket/qlocalsocket_unix.cpp10
-rw-r--r--src/network/socket/qlocalsocket_win.cpp13
-rw-r--r--src/network/ssl/qasn1element.cpp2
-rw-r--r--src/network/ssl/qocspresponse.cpp4
-rw-r--r--src/network/ssl/qssl.h4
-rw-r--r--src/network/ssl/qsslcertificate.cpp22
-rw-r--r--src/network/ssl/qsslcertificate.h9
-rw-r--r--src/network/ssl/qsslcertificate_openssl.cpp2
-rw-r--r--src/network/ssl/qsslcertificate_qt.cpp20
-rw-r--r--src/network/ssl/qsslconfiguration.cpp25
-rw-r--r--src/network/ssl/qsslconfiguration.h4
-rw-r--r--src/network/ssl/qsslcontext_openssl.cpp31
-rw-r--r--src/network/ssl/qsslcontext_openssl_p.h2
-rw-r--r--src/network/ssl/qsslellipticcurve.h23
-rw-r--r--src/network/ssl/qsslerror.h2
-rw-r--r--src/network/ssl/qsslsocket.cpp60
-rw-r--r--src/network/ssl/qsslsocket.h2
-rw-r--r--src/network/ssl/qsslsocket_mac.cpp2
-rw-r--r--src/network/ssl/qsslsocket_mac_shared.cpp2
-rw-r--r--src/network/ssl/qsslsocket_openssl.cpp18
-rw-r--r--src/network/ssl/qsslsocket_openssl_android.cpp2
-rw-r--r--src/network/ssl/qsslsocket_openssl_symbols.cpp4
-rw-r--r--src/network/ssl/qsslsocket_openssl_symbols_p.h3
-rw-r--r--src/network/ssl/qsslsocket_p.h1
-rw-r--r--src/network/ssl/qsslsocket_schannel.cpp227
-rw-r--r--src/network/ssl/qsslsocket_schannel_p.h3
-rw-r--r--src/network/ssl/qtls_utils_p.h (renamed from src/widgets/statemachine/qbasicmouseeventtransition_p.h)73
-rw-r--r--src/network/ssl/ssl.pri5
-rw-r--r--src/opengl/.prev_CMakeLists.txt14
-rw-r--r--src/opengl/CMakeLists.txt15
-rw-r--r--src/opengl/doc/src/qt6-changes.qdoc46
-rw-r--r--src/opengl/doc/src/qtopengl-index.qdoc6
-rw-r--r--src/opengl/qopengldebug.cpp4
-rw-r--r--src/opengl/qopengldebug.h2
-rw-r--r--src/opengl/qopenglframebufferobject.cpp13
-rw-r--r--src/opengl/qopenglframebufferobject.h3
-rw-r--r--src/opengl/qopenglfunctions_3_1.h22
-rw-r--r--src/opengl/qopenglfunctions_3_2_core.h22
-rw-r--r--src/opengl/qopenglfunctions_3_3_core.h270
-rw-r--r--src/opengl/qopenglfunctions_4_0_core.h270
-rw-r--r--src/opengl/qopenglfunctions_4_1_core.h270
-rw-r--r--src/opengl/qopenglfunctions_4_2_core.h270
-rw-r--r--src/opengl/qopenglfunctions_4_3_core.h270
-rw-r--r--src/opengl/qopenglpixeltransferoptions.h3
-rw-r--r--src/opengl/qopenglshaderprogram.cpp4
-rw-r--r--src/opengl/qopengltexture.cpp116
-rw-r--r--src/opengl/qopengltexture.h29
-rw-r--r--src/opengl/qopengltextureblitter.cpp2
-rw-r--r--src/opengl/qopenglversionfunctions.h69
-rw-r--r--src/opengl/qopenglversionprofile.h3
-rw-r--r--src/openglwidgets/CMakeLists.txt2
-rw-r--r--src/openglwidgets/qopenglwidget.cpp18
-rw-r--r--src/platformsupport/devicediscovery/.prev_CMakeLists.txt8
-rw-r--r--src/platformsupport/devicediscovery/CMakeLists.txt8
-rw-r--r--src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h2
-rw-r--r--src/platformsupport/devicediscovery/qdevicediscovery_static_p.h2
-rw-r--r--src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp2
-rw-r--r--src/platformsupport/fbconvenience/CMakeLists.txt2
-rw-r--r--src/platformsupport/input/.prev_CMakeLists.txt25
-rw-r--r--src/platformsupport/input/CMakeLists.txt25
-rw-r--r--src/platformsupport/input/evdevkeyboard/qevdevkeyboardhandler.cpp4
-rw-r--r--src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp1
-rw-r--r--src/platformsupport/input/libinput/libinput.pri1
-rw-r--r--src/platformsupport/input/tslib/qtslib_p.h2
-rw-r--r--src/platformsupport/kmsconvenience/.prev_CMakeLists.txt2
-rw-r--r--src/platformsupport/kmsconvenience/CMakeLists.txt2
-rw-r--r--src/plugins/generic/bsdmouse/qbsdmouse.cpp1
-rw-r--r--src/plugins/generic/tuiotouch/qoscbundle.cpp4
-rw-r--r--src/plugins/generic/tuiotouch/qoscmessage.cpp4
-rw-r--r--src/plugins/imageformats/gif/qgifhandler.cpp17
-rw-r--r--src/plugins/imageformats/ico/qicohandler.cpp7
-rw-r--r--src/plugins/imageformats/jpeg/.prev_CMakeLists.txt9
-rw-r--r--src/plugins/imageformats/jpeg/CMakeLists.txt9
-rw-r--r--src/plugins/imageformats/jpeg/qjpeghandler.cpp14
-rw-r--r--src/plugins/platforminputcontexts/ibus/CMakeLists.txt2
-rw-r--r--src/plugins/platforminputcontexts/ibus/ibus.pro1
-rw-r--r--src/plugins/platforms/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/android/.prev_CMakeLists.txt6
-rw-r--r--src/plugins/platforms/android/CMakeLists.txt6
-rw-r--r--src/plugins/platforms/android/androidcontentfileengine.cpp85
-rw-r--r--src/plugins/platforms/android/androidcontentfileengine.h15
-rw-r--r--src/plugins/platforms/android/androidjniaccessibility.cpp6
-rw-r--r--src/plugins/platforms/android/androidjnimain.cpp7
-rw-r--r--src/plugins/platforms/android/androidjnimain.h4
-rw-r--r--src/plugins/platforms/android/androidjnimenu.cpp6
-rw-r--r--src/plugins/platforms/android/extract-dummy.cpp6
-rw-r--r--src/plugins/platforms/android/extract.cpp10
-rw-r--r--src/plugins/platforms/android/qandroideventdispatcher.h2
-rw-r--r--src/plugins/platforms/android/qandroidinputcontext.cpp8
-rw-r--r--src/plugins/platforms/android/qandroidplatformdialoghelpers.cpp4
-rw-r--r--src/plugins/platforms/android/qandroidplatformfiledialoghelper.cpp2
-rw-r--r--src/plugins/platforms/android/qandroidplatformintegration.cpp21
-rw-r--r--src/plugins/platforms/android/qandroidplatformintegration.h14
-rw-r--r--src/plugins/platforms/android/qandroidplatformmenu.h1
-rw-r--r--src/plugins/platforms/android/qandroidplatformoffscreensurface.cpp29
-rw-r--r--src/plugins/platforms/android/qandroidplatformoffscreensurface.h15
-rw-r--r--src/plugins/platforms/android/qandroidplatformopenglcontext.cpp5
-rw-r--r--src/plugins/platforms/android/qandroidplatformtheme.cpp4
-rw-r--r--src/plugins/platforms/bsdfb/qbsdfbscreen.cpp1
-rw-r--r--src/plugins/platforms/cocoa/.prev_CMakeLists.txt10
-rw-r--r--src/plugins/platforms/cocoa/CMakeLists.txt10
-rw-r--r--src/plugins/platforms/cocoa/qcocoaapplicationdelegate.mm4
-rw-r--r--src/plugins/platforms/cocoa/qcocoabackingstore.h18
-rw-r--r--src/plugins/platforms/cocoa/qcocoabackingstore.mm303
-rw-r--r--src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm30
-rw-r--r--src/plugins/platforms/cocoa/qcocoadrag.h2
-rw-r--r--src/plugins/platforms/cocoa/qcocoadrag.mm21
-rw-r--r--src/plugins/platforms/cocoa/qcocoaeventdispatcher.h4
-rw-r--r--src/plugins/platforms/cocoa/qcocoaeventdispatcher.mm12
-rw-r--r--src/plugins/platforms/cocoa/qcocoafiledialoghelper.mm4
-rw-r--r--src/plugins/platforms/cocoa/qcocoafontdialoghelper.mm2
-rw-r--r--src/plugins/platforms/cocoa/qcocoaglcontext.h3
-rw-r--r--src/plugins/platforms/cocoa/qcocoaglcontext.mm58
-rw-r--r--src/plugins/platforms/cocoa/qcocoahelpers.h4
-rw-r--r--src/plugins/platforms/cocoa/qcocoahelpers.mm11
-rw-r--r--src/plugins/platforms/cocoa/qcocoaintegration.h3
-rw-r--r--src/plugins/platforms/cocoa/qcocoaintegration.mm18
-rw-r--r--src/plugins/platforms/cocoa/qcocoakeymapper.mm44
-rw-r--r--src/plugins/platforms/cocoa/qcocoamenu.h2
-rw-r--r--src/plugins/platforms/cocoa/qcocoamenu.mm2
-rw-r--r--src/plugins/platforms/cocoa/qcocoamenubar.h2
-rw-r--r--src/plugins/platforms/cocoa/qcocoamenuitem.mm5
-rw-r--r--src/plugins/platforms/cocoa/qcocoasystemtrayicon.mm2
-rw-r--r--src/plugins/platforms/cocoa/qcocoatheme.mm20
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.h4
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm57
-rw-r--r--src/plugins/platforms/cocoa/qmacclipboard.h2
-rw-r--r--src/plugins/platforms/cocoa/qmacclipboard.mm6
-rw-r--r--src/plugins/platforms/cocoa/qnsview_drawing.mm62
-rw-r--r--src/plugins/platforms/cocoa/qnsview_keys.mm39
-rw-r--r--src/plugins/platforms/direct2d/CMakeLists.txt283
-rw-r--r--src/plugins/platforms/directfb/.prev_CMakeLists.txt6
-rw-r--r--src/plugins/platforms/directfb/CMakeLists.txt6
-rw-r--r--src/plugins/platforms/directfb/main.cpp2
-rw-r--r--src/plugins/platforms/directfb/qdirectfb_egl.cpp2
-rw-r--r--src/plugins/platforms/directfb/qdirectfbconvenience.cpp8
-rw-r--r--src/plugins/platforms/directfb/qdirectfbconvenience.h4
-rw-r--r--src/plugins/platforms/eglfs/.prev_CMakeLists.txt14
-rw-r--r--src/plugins/platforms/eglfs/CMakeLists.txt31
-rw-r--r--src/plugins/platforms/eglfs/api/qeglfsdeviceintegration.cpp13
-rw-r--r--src/plugins/platforms/eglfs/api/qeglfsdeviceintegration_p.h2
-rw-r--r--src/plugins/platforms/eglfs/api/qeglfsintegration_p.h4
-rw-r--r--src/plugins/platforms/eglfs/api/qeglfsscreen.cpp4
-rw-r--r--src/plugins/platforms/eglfs/api/qeglfsscreen_p.h2
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.cpp16
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/qeglfsemulatorscreen.h3
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/.prev_CMakeLists.txt32
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt7
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/.prev_CMakeLists.txt28
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt9
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.cpp14
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h1
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_vsp2/qeglfskmsvsp2screen.h2
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_viv/CMakeLists.txt27
-rw-r--r--src/plugins/platforms/eglfs/deviceintegration/eglfs_viv_wl/CMakeLists.txt29
-rw-r--r--src/plugins/platforms/integrity/qintegrityhidmanager.h2
-rw-r--r--src/plugins/platforms/ios/.prev_CMakeLists.txt4
-rw-r--r--src/plugins/platforms/ios/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/ios/optional/nsphotolibrarysupport/CMakeLists.txt8
-rw-r--r--src/plugins/platforms/ios/optional/nsphotolibrarysupport/plugin.mm2
-rw-r--r--src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm6
-rw-r--r--src/plugins/platforms/ios/qiosclipboard.mm4
-rw-r--r--src/plugins/platforms/ios/qioseventdispatcher.h6
-rw-r--r--src/plugins/platforms/ios/qioseventdispatcher.mm5
-rw-r--r--src/plugins/platforms/ios/qiosglobal.mm2
-rw-r--r--src/plugins/platforms/ios/qiosinputcontext.h10
-rw-r--r--src/plugins/platforms/ios/qiosinputcontext.mm4
-rw-r--r--src/plugins/platforms/ios/qiosmenu.mm12
-rw-r--r--src/plugins/platforms/ios/qiosscreen.mm12
-rw-r--r--src/plugins/platforms/ios/qiostheme.mm2
-rw-r--r--src/plugins/platforms/ios/quiview.mm2
-rw-r--r--src/plugins/platforms/linuxfb/.prev_CMakeLists.txt4
-rw-r--r--src/plugins/platforms/linuxfb/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/linuxfb/qlinuxfbintegration.h2
-rw-r--r--src/plugins/platforms/minimal/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/platforms/minimal/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/minimalegl/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/platforms/minimalegl/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/offscreen/.prev_CMakeLists.txt4
-rw-r--r--src/plugins/platforms/offscreen/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/offscreen/offscreen.pro1
-rw-r--r--src/plugins/platforms/offscreen/qoffscreenintegration.cpp17
-rw-r--r--src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp6
-rw-r--r--src/plugins/platforms/offscreen/qoffscreenintegration_x11.h2
-rw-r--r--src/plugins/platforms/qnx/qqnxabstractnavigator.h2
-rw-r--r--src/plugins/platforms/qnx/qqnxabstractvirtualkeyboard.h2
-rw-r--r--src/plugins/platforms/qnx/qqnxbuffer.cpp2
-rw-r--r--src/plugins/platforms/qnx/qqnxbuffer.h4
-rw-r--r--src/plugins/platforms/qnx/qqnxbuttoneventnotifier.h2
-rw-r--r--src/plugins/platforms/qnx/qqnxclipboard.cpp4
-rw-r--r--src/plugins/platforms/qnx/qqnxglcontext.cpp4
-rw-r--r--src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp22
-rw-r--r--src/plugins/platforms/qnx/qqnxnavigatoreventhandler.h2
-rw-r--r--src/plugins/platforms/qnx/qqnxnavigatoreventnotifier.h2
-rw-r--r--src/plugins/platforms/qnx/qqnxnavigatorpps.h2
-rw-r--r--src/plugins/platforms/qnx/qqnxrasterbackingstore.cpp2
-rw-r--r--src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp73
-rw-r--r--src/plugins/platforms/qnx/qqnxscreeneventhandler.h1
-rw-r--r--src/plugins/platforms/qnx/qqnxwindow.cpp6
-rw-r--r--src/plugins/platforms/vnc/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/platforms/vnc/CMakeLists.txt2
-rw-r--r--src/plugins/platforms/vnc/qvnc.cpp7
-rw-r--r--src/plugins/platforms/wasm/qwasmcompositor.cpp6
-rw-r--r--src/plugins/platforms/wasm/qwasmeventdispatcher.cpp4
-rw-r--r--src/plugins/platforms/wasm/qwasmeventtranslator.cpp23
-rw-r--r--src/plugins/platforms/wasm/qwasmeventtranslator.h1
-rw-r--r--src/plugins/platforms/wasm/qwasmintegration.cpp14
-rw-r--r--src/plugins/platforms/wasm/qwasmscreen.cpp65
-rw-r--r--src/plugins/platforms/wasm/qwasmscreen.h3
-rw-r--r--src/plugins/platforms/wasm/qwasmtheme.cpp2
-rw-r--r--src/plugins/platforms/wasm/wasm_shell.html9
-rw-r--r--src/plugins/platforms/windows/.prev_CMakeLists.txt26
-rw-r--r--src/plugins/platforms/windows/CMakeLists.txt32
-rw-r--r--src/plugins/platforms/windows/main.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowsapplication.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowsapplication.h6
-rw-r--r--src/plugins/platforms/windows/qwindowscombase.h7
-rw-r--r--src/plugins/platforms/windows/qwindowscursor.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.cpp24
-rw-r--r--src/plugins/platforms/windows/qwindowsdialoghelpers.h2
-rw-r--r--src/plugins/platforms/windows/qwindowsdrag.cpp27
-rw-r--r--src/plugins/platforms/windows/qwindowsdrag.h10
-rw-r--r--src/plugins/platforms/windows/qwindowsdropdataobject.h4
-rw-r--r--src/plugins/platforms/windows/qwindowsglcontext.cpp7
-rw-r--r--src/plugins/platforms/windows/qwindowsglcontext.h2
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowsintegration.h5
-rw-r--r--src/plugins/platforms/windows/qwindowsinternalmimedata.cpp9
-rw-r--r--src/plugins/platforms/windows/qwindowsinternalmimedata.h2
-rw-r--r--src/plugins/platforms/windows/qwindowskeymapper.cpp10
-rw-r--r--src/plugins/platforms/windows/qwindowsmime.cpp58
-rw-r--r--src/plugins/platforms/windows/qwindowsmime.h4
-rw-r--r--src/plugins/platforms/windows/qwindowsmousehandler.cpp14
-rw-r--r--src/plugins/platforms/windows/qwindowsole.h30
-rw-r--r--src/plugins/platforms/windows/qwindowsopengltester.cpp4
-rw-r--r--src/plugins/platforms/windows/qwindowspointerhandler.cpp14
-rw-r--r--src/plugins/platforms/windows/qwindowsservices.cpp36
-rw-r--r--src/plugins/platforms/windows/qwindowstabletsupport.cpp30
-rw-r--r--src/plugins/platforms/windows/qwindowstheme.cpp2
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.cpp8
-rw-r--r--src/plugins/platforms/windows/qwindowswindow.h9
-rw-r--r--src/plugins/platforms/xcb/.prev_CMakeLists.txt25
-rw-r--r--src/plugins/platforms/xcb/CMakeLists.txt28
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/xcb_egl/qxcbeglintegration.h2
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt4
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.h2
-rw-r--r--src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxintegration.h2
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qcolormap_x11.cpp6
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qpaintengine_x11.cpp16
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qpixmap_x11.cpp10
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qt_x11_p.h2
-rw-r--r--src/plugins/platforms/xcb/nativepainting/qtessellator.cpp2
-rw-r--r--src/plugins/platforms/xcb/qxcbbackingstore.cpp13
-rw-r--r--src/plugins/platforms/xcb/qxcbclipboard.cpp4
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.cpp12
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection.h3
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_basic.cpp14
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_basic.h3
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_screens.cpp17
-rw-r--r--src/plugins/platforms/xcb/qxcbconnection_xi2.cpp124
-rw-r--r--src/plugins/platforms/xcb/qxcbdrag.cpp27
-rw-r--r--src/plugins/platforms/xcb/qxcbeventdispatcher.cpp12
-rw-r--r--src/plugins/platforms/xcb/qxcbeventdispatcher.h6
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.cpp6
-rw-r--r--src/plugins/platforms/xcb/qxcbintegration.h4
-rw-r--r--src/plugins/platforms/xcb/qxcbmime.cpp8
-rw-r--r--src/plugins/platforms/xcb/qxcbmime.h4
-rw-r--r--src/plugins/platforms/xcb/qxcbscreen.cpp50
-rw-r--r--src/plugins/platforms/xcb/qxcbscreen.h9
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp41
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.h3
-rw-r--r--src/plugins/platforms/xcb/xcb_qpa_lib.pro2
-rw-r--r--src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp3
-rw-r--r--src/plugins/platformthemes/gtk3/qgtk3menu.cpp4
-rw-r--r--src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog.cpp65
-rw-r--r--src/plugins/platformthemes/xdgdesktopportal/qxdgdesktopportalfiledialog_p.h2
-rw-r--r--src/plugins/printsupport/.prev_CMakeLists.txt3
-rw-r--r--src/plugins/printsupport/CMakeLists.txt3
-rw-r--r--src/plugins/printsupport/cups/qppdprintdevice.cpp6
-rw-r--r--src/plugins/printsupport/printsupport.pro1
-rw-r--r--src/plugins/printsupport/windows/main.cpp66
-rw-r--r--src/plugins/printsupport/windows/windows.pro26
-rw-r--r--src/plugins/sqldrivers/db2/CMakeLists.txt2
-rw-r--r--src/plugins/sqldrivers/db2/qsql_db2.cpp18
-rw-r--r--src/plugins/sqldrivers/db2/qsql_db2_p.h4
-rw-r--r--src/plugins/sqldrivers/ibase/qsql_ibase.cpp67
-rw-r--r--src/plugins/sqldrivers/ibase/qsql_ibase_p.h6
-rw-r--r--src/plugins/sqldrivers/mysql/qsql_mysql.cpp28
-rw-r--r--src/plugins/sqldrivers/oci/CMakeLists.txt2
-rw-r--r--src/plugins/sqldrivers/oci/qsql_oci.cpp15
-rw-r--r--src/plugins/sqldrivers/oci/qsql_oci_p.h4
-rw-r--r--src/plugins/sqldrivers/odbc/.prev_CMakeLists.txt2
-rw-r--r--src/plugins/sqldrivers/odbc/CMakeLists.txt2
-rw-r--r--src/plugins/sqldrivers/odbc/qsql_odbc.cpp70
-rw-r--r--src/plugins/sqldrivers/psql/qsql_psql.cpp27
-rw-r--r--src/plugins/sqldrivers/qt_cmdline.cmake18
-rw-r--r--src/plugins/sqldrivers/sqlite/.prev_CMakeLists.txt18
-rw-r--r--src/plugins/sqldrivers/sqlite/CMakeLists.txt21
-rw-r--r--src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp55
-rw-r--r--src/plugins/styles/CMakeLists.txt2
-rw-r--r--src/plugins/styles/android/CMakeLists.txt20
-rw-r--r--src/plugins/styles/android/qandroidstyle.cpp23
-rw-r--r--src/plugins/styles/android/qandroidstyle_p.h36
-rw-r--r--src/plugins/styles/mac/macstyle.json2
-rw-r--r--src/plugins/styles/mac/main.mm2
-rw-r--r--src/plugins/styles/mac/qmacstyle_mac.mm95
-rw-r--r--src/plugins/styles/mac/qmacstyle_mac_p.h30
-rw-r--r--src/plugins/styles/windowsvista/qwindowsvistastyle.cpp39
-rw-r--r--src/plugins/styles/windowsvista/qwindowsvistastyle_p.h3
-rw-r--r--src/plugins/styles/windowsvista/qwindowsvistastyle_p_p.h2
-rw-r--r--src/plugins/styles/windowsvista/qwindowsxpstyle.cpp478
-rw-r--r--src/plugins/styles/windowsvista/qwindowsxpstyle_p.h7
-rw-r--r--src/printsupport/CMakeLists.txt47
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.cpp52
-rw-r--r--src/printsupport/dialogs/qabstractprintdialog.h11
-rw-r--r--src/printsupport/dialogs/qpagesetupdialog_mac.mm2
-rw-r--r--src/printsupport/dialogs/qpagesetupdialog_win.cpp2
-rw-r--r--src/printsupport/dialogs/qprintdialog_mac.mm2
-rw-r--r--src/printsupport/dialogs/qprintdialog_unix.cpp40
-rw-r--r--src/printsupport/dialogs/qprintdialog_win.cpp16
-rw-r--r--src/printsupport/dialogs/qprintpreviewdialog.cpp4
-rw-r--r--src/printsupport/doc/src/qt6-changes.qdoc46
-rw-r--r--src/printsupport/doc/src/qtprintsupport-index.qdoc6
-rw-r--r--src/printsupport/kernel/kernel.pri9
-rw-r--r--src/printsupport/kernel/qcups.cpp2
-rw-r--r--src/printsupport/kernel/qprinter.cpp605
-rw-r--r--src/printsupport/kernel/qprinter.h54
-rw-r--r--src/printsupport/kernel/qprinterinfo.cpp45
-rw-r--r--src/printsupport/kernel/qprinterinfo.h5
-rw-r--r--src/printsupport/platform/windows/qprintengine_win.cpp (renamed from src/printsupport/kernel/qprintengine_win.cpp)4
-rw-r--r--src/printsupport/platform/windows/qprintengine_win_p.h (renamed from src/printsupport/kernel/qprintengine_win_p.h)38
-rw-r--r--src/printsupport/platform/windows/qwindowsprintdevice.cpp (renamed from src/plugins/printsupport/windows/qwindowsprintdevice.cpp)61
-rw-r--r--src/printsupport/platform/windows/qwindowsprintdevice_p.h (renamed from src/plugins/printsupport/windows/qwindowsprintdevice.h)13
-rw-r--r--src/printsupport/platform/windows/qwindowsprinterinfo.cpp (renamed from src/plugins/printsupport/windows/qwindowsprinterinfo.cpp)0
-rw-r--r--src/printsupport/platform/windows/qwindowsprintersupport.cpp (renamed from src/plugins/printsupport/windows/qwindowsprintersupport.cpp)36
-rw-r--r--src/printsupport/platform/windows/qwindowsprintersupport_p.h (renamed from src/plugins/printsupport/windows/qwindowsprintersupport.h)21
-rw-r--r--src/printsupport/platform/windows/windows.json (renamed from src/plugins/printsupport/windows/windows.json)0
-rw-r--r--src/printsupport/platform/windows/windows.pri16
-rw-r--r--src/printsupport/printsupport.pro1
-rw-r--r--src/printsupport/qt_cmdline.cmake1
-rw-r--r--src/printsupport/widgets/qprintpreviewwidget.cpp18
-rw-r--r--src/printsupport/widgets/qprintpreviewwidget.h4
-rw-r--r--src/sql/CMakeLists.txt8
-rw-r--r--src/sql/doc/snippets/code/code.pro11
-rw-r--r--src/sql/doc/snippets/snippets.pro23
-rw-r--r--src/sql/doc/snippets/sqldatabase/sqldatabase.cpp4
-rw-r--r--src/sql/doc/snippets/sqldatabase/sqldatabase.pro6
-rw-r--r--src/sql/doc/src/qt6-changes.qdoc2
-rw-r--r--src/sql/doc/src/qtsql.qdoc6
-rw-r--r--src/sql/doc/src/sql-driver.qdoc10
-rw-r--r--src/sql/kernel/qsqldriver.cpp17
-rw-r--r--src/sql/kernel/qsqldriver.h2
-rw-r--r--src/sql/kernel/qsqlerror.cpp16
-rw-r--r--src/sql/kernel/qsqlerror.h12
-rw-r--r--src/sql/kernel/qsqlfield.cpp65
-rw-r--r--src/sql/kernel/qsqlfield.h24
-rw-r--r--src/sql/kernel/qsqlrecord.h1
-rw-r--r--src/sql/kernel/qsqlresult.cpp11
-rw-r--r--src/sql/models/qsqlrelationaldelegate.h57
-rw-r--r--src/sql/models/qsqlrelationaltablemodel.cpp3
-rw-r--r--src/sql/qt_cmdline.cmake0
-rw-r--r--src/src.pro14
-rw-r--r--src/testlib/.prev_CMakeLists.txt18
-rw-r--r--src/testlib/CMakeLists.txt21
-rw-r--r--src/testlib/doc/snippets/code/code.pro11
-rw-r--r--src/testlib/doc/snippets/code/doc_src_cmakelists.txt4
-rw-r--r--src/testlib/doc/snippets/code/doc_src_qtestlib.pro4
-rw-r--r--src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core_snippet.cpp2
-rw-r--r--src/testlib/doc/snippets/snippets.pro19
-rw-r--r--src/testlib/doc/src/qt6-changes.qdoc46
-rw-r--r--src/testlib/doc/src/qttest-index.qdoc6
-rw-r--r--src/testlib/doc/src/qttestlib-manual.qdoc10
-rw-r--r--src/testlib/qabstractitemmodeltester.cpp8
-rw-r--r--src/testlib/qappletestlogger_p.h4
-rw-r--r--src/testlib/qbenchmarkvalgrind.cpp2
-rw-r--r--src/testlib/qbenchmarkvalgrind_p.h2
-rw-r--r--src/testlib/qplaintestlogger.cpp3
-rw-r--r--src/testlib/qsignaldumper.cpp4
-rw-r--r--src/testlib/qsignalspy.h2
-rw-r--r--src/testlib/qt_cmdline.cmake0
-rw-r--r--src/testlib/qtest.h165
-rw-r--r--src/testlib/qtest_gui.h12
-rw-r--r--src/testlib/qtestblacklist.cpp22
-rw-r--r--src/testlib/qtestcase.cpp30
-rw-r--r--src/testlib/qtestcase.h8
-rw-r--r--src/testlib/qtestdata.cpp8
-rw-r--r--src/testlib/qtesteventloop.h11
-rw-r--r--src/testlib/qtestkeyboard.h22
-rw-r--r--src/testlib/qtestresult.cpp8
-rw-r--r--src/testlib/qtesttouch.h165
-rw-r--r--src/testlib/qxctestlogger.mm2
-rw-r--r--src/testlib/qxctestlogger_p.h4
-rw-r--r--src/testlib/selfcover.cmake2
-rw-r--r--src/tools/CMakeLists.txt4
-rw-r--r--src/tools/androiddeployqt/.prev_CMakeLists.txt2
-rw-r--r--src/tools/androiddeployqt/CMakeLists.txt2
-rw-r--r--src/tools/androiddeployqt/main.cpp85
-rw-r--r--src/tools/androidtestrunner/CMakeLists.txt2
-rw-r--r--src/tools/androidtestrunner/main.cpp62
-rw-r--r--src/tools/bootstrap/.prev_CMakeLists.txt26
-rw-r--r--src/tools/bootstrap/CMakeLists.txt27
-rw-r--r--src/tools/bootstrap/bootstrap.pro8
-rw-r--r--src/tools/cmake_automoc_parser/CMakeLists.txt2
-rw-r--r--src/tools/cmake_automoc_parser/main.cpp6
-rw-r--r--src/tools/moc/.prev_CMakeLists.txt10
-rw-r--r--src/tools/moc/CMakeLists.txt10
-rw-r--r--src/tools/moc/generator.cpp402
-rw-r--r--src/tools/moc/generator.h1
-rw-r--r--src/tools/moc/keywords.cpp61
-rw-r--r--src/tools/moc/moc.cpp201
-rw-r--r--src/tools/moc/moc.h14
-rw-r--r--src/tools/moc/moc.pro3
-rw-r--r--src/tools/moc/parser.h1
-rw-r--r--src/tools/moc/token.h1
-rw-r--r--src/tools/moc/util/generate_keywords.cpp7
-rw-r--r--src/tools/qdbuscpp2xml/.prev_CMakeLists.txt6
-rw-r--r--src/tools/qdbuscpp2xml/CMakeLists.txt6
-rw-r--r--src/tools/qdbuscpp2xml/qdbuscpp2xml.cpp22
-rw-r--r--src/tools/qdbusxml2cpp/.prev_CMakeLists.txt6
-rw-r--r--src/tools/qdbusxml2cpp/CMakeLists.txt8
-rw-r--r--src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp12
-rw-r--r--src/tools/qlalr/.prev_CMakeLists.txt2
-rw-r--r--src/tools/qlalr/CMakeLists.txt2
-rw-r--r--src/tools/qlalr/examples/glsl/glsl-lex.l2
-rw-r--r--src/tools/qlalr/lalr.cpp4
-rw-r--r--src/tools/qlalr/lalr.h1
-rw-r--r--src/tools/qvkgen/.prev_CMakeLists.txt2
-rw-r--r--src/tools/qvkgen/CMakeLists.txt2
-rw-r--r--src/tools/qvkgen/qvkgen.cpp4
-rw-r--r--src/tools/rcc/.prev_CMakeLists.txt6
-rw-r--r--src/tools/rcc/CMakeLists.txt6
-rw-r--r--src/tools/rcc/rcc.cpp37
-rw-r--r--src/tools/tracegen/.prev_CMakeLists.txt2
-rw-r--r--src/tools/tracegen/CMakeLists.txt2
-rw-r--r--src/tools/tracegen/lttng.cpp3
-rw-r--r--src/tools/tracegen/panic.cpp13
-rw-r--r--src/tools/tracegen/panic.h1
-rw-r--r--src/tools/uic/.prev_CMakeLists.txt2
-rw-r--r--src/tools/uic/CMakeLists.txt2
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp4
-rw-r--r--src/tools/uic/qclass_lib_map.h46
-rw-r--r--src/tools/uic/uic.cpp2
-rw-r--r--src/widgets/.prev_CMakeLists.txt207
-rw-r--r--src/widgets/CMakeLists.txt207
-rw-r--r--src/widgets/Qt5WidgetsConfigExtras.cmake.in31
-rw-r--r--src/widgets/accessible/qaccessiblewidgetfactory.cpp2
-rw-r--r--src/widgets/configure.cmake11
-rw-r--r--src/widgets/configure.json8
-rw-r--r--src/widgets/dialogs/dialogs.pri11
-rw-r--r--src/widgets/dialogs/qdialog_p.h4
-rw-r--r--src/widgets/dialogs/qfiledialog.cpp152
-rw-r--r--src/widgets/dialogs/qfiledialog.h6
-rw-r--r--src/widgets/dialogs/qfiledialog_p.h17
-rw-r--r--src/widgets/dialogs/qfontdialog.cpp2
-rw-r--r--src/widgets/dialogs/qfscompleter_p.h2
-rw-r--r--src/widgets/dialogs/qmessagebox.cpp8
-rw-r--r--src/widgets/dialogs/qprogressdialog.cpp75
-rw-r--r--src/widgets/dialogs/qsidebar.cpp8
-rw-r--r--src/widgets/dialogs/qwizard.cpp44
-rw-r--r--src/widgets/dialogs/qwizard_win.cpp4
-rw-r--r--src/widgets/dialogs/qwizard_win_p.h2
-rw-r--r--src/widgets/doc/snippets/code/doc_src_qt4-styles.cpp2
-rw-r--r--src/widgets/doc/snippets/customviewstyle/customviewstyle.cpp (renamed from src/widgets/doc/snippets/customviewstyle.cpp)2
-rw-r--r--src/widgets/doc/snippets/customviewstyle/customviewstyle.pro10
-rw-r--r--src/widgets/doc/snippets/dockwidgets/mainwindow.cpp2
-rw-r--r--src/widgets/doc/snippets/filedialogurls/filedialogurls.cpp (renamed from src/widgets/doc/snippets/filedialogurls.cpp)2
-rw-r--r--src/widgets/doc/snippets/filedialogurls/filedialogurls.pro6
-rw-r--r--src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditem.pro6
-rw-r--r--src/widgets/doc/snippets/graphicssceneadditem/graphicssceneadditemsnippet.cpp (renamed from src/widgets/doc/snippets/graphicssceneadditemsnippet.cpp)6
-rw-r--r--src/widgets/doc/snippets/graphicsview/graphicsview.cpp (renamed from src/widgets/doc/snippets/graphicsview.cpp)15
-rw-r--r--src/widgets/doc/snippets/graphicsview/graphicsview.pro6
-rw-r--r--src/widgets/doc/snippets/graphicsview/graphicsview_snippet.cpp (renamed from src/widgets/doc/snippets/graphicsview_snippet.cpp)0
-rw-r--r--src/widgets/doc/snippets/mdiarea/mdiarea.pro7
-rw-r--r--src/widgets/doc/snippets/mdiarea/mdiareasnippets.cpp (renamed from src/widgets/doc/snippets/mdiareasnippets.cpp)22
-rw-r--r--src/widgets/doc/snippets/myscrollarea/myscrollarea.cpp (renamed from src/widgets/doc/snippets/myscrollarea.cpp)0
-rw-r--r--src/widgets/doc/snippets/myscrollarea/myscrollarea.pro7
-rw-r--r--src/widgets/doc/snippets/qlistview-dnd/model.h2
-rw-r--r--src/widgets/doc/snippets/qmacnativewidget/main.mm94
-rw-r--r--src/widgets/doc/snippets/qstackedwidget/main.cpp2
-rw-r--r--src/widgets/doc/snippets/qstyleoption/main.cpp2
-rw-r--r--src/widgets/doc/snippets/qstyleplugin/main.cpp2
-rw-r--r--src/widgets/doc/snippets/reading-selections/window.h2
-rw-r--r--src/widgets/doc/snippets/snippets.pro22
-rw-r--r--src/widgets/doc/snippets/splitter/splitter.cpp2
-rw-r--r--src/widgets/doc/snippets/splitterhandle/splitter.h2
-rw-r--r--src/widgets/doc/snippets/updating-selections/window.h2
-rw-r--r--src/widgets/doc/src/graphicsview.qdoc14
-rw-r--r--src/widgets/doc/src/modelview.qdoc2
-rw-r--r--src/widgets/doc/src/qt6-changes.qdoc105
-rw-r--r--src/widgets/doc/src/qtwidgets-index.qdoc6
-rw-r--r--src/widgets/doc/src/widgets-and-layouts/gallery.qdoc2
-rw-r--r--src/widgets/effects/qpixmapfilter.cpp18
-rw-r--r--src/widgets/graphicsview/qgraphicsitem.cpp18
-rw-r--r--src/widgets/graphicsview/qgraphicsitem_p.h4
-rw-r--r--src/widgets/graphicsview/qgraphicslayoutitem.cpp16
-rw-r--r--src/widgets/graphicsview/qgraphicsproxywidget.cpp4
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.cpp48
-rw-r--r--src/widgets/graphicsview/qgraphicsscene.h2
-rw-r--r--src/widgets/graphicsview/qgraphicsscene_bsp.cpp4
-rw-r--r--src/widgets/graphicsview/qgraphicsscenelinearindex.cpp2
-rw-r--r--src/widgets/graphicsview/qgraphicsview.cpp5
-rw-r--r--src/widgets/graphicsview/qgraphicswidget.cpp6
-rw-r--r--src/widgets/graphicsview/qgraphicswidget_p.cpp12
-rw-r--r--src/widgets/itemviews/qabstractitemview.cpp159
-rw-r--r--src/widgets/itemviews/qabstractitemview.h9
-rw-r--r--src/widgets/itemviews/qabstractitemview_p.h34
-rw-r--r--src/widgets/itemviews/qcolumnview.cpp8
-rw-r--r--src/widgets/itemviews/qcolumnview_p.h9
-rw-r--r--src/widgets/itemviews/qdatawidgetmapper.cpp4
-rw-r--r--src/widgets/itemviews/qfileiconprovider.cpp102
-rw-r--r--src/widgets/itemviews/qfileiconprovider.h22
-rw-r--r--src/widgets/itemviews/qfileiconprovider_p.h5
-rw-r--r--src/widgets/itemviews/qheaderview.cpp72
-rw-r--r--src/widgets/itemviews/qheaderview.h1
-rw-r--r--src/widgets/itemviews/qitemdelegate.cpp4
-rw-r--r--src/widgets/itemviews/qlistview.cpp76
-rw-r--r--src/widgets/itemviews/qlistview.h3
-rw-r--r--src/widgets/itemviews/qlistview_p.h28
-rw-r--r--src/widgets/itemviews/qlistwidget.h1
-rw-r--r--src/widgets/itemviews/qstyleditemdelegate.cpp71
-rw-r--r--src/widgets/itemviews/qtableview.cpp38
-rw-r--r--src/widgets/itemviews/qtableview.h2
-rw-r--r--src/widgets/itemviews/qtablewidget.cpp17
-rw-r--r--src/widgets/itemviews/qtablewidget.h1
-rw-r--r--src/widgets/itemviews/qtreeview.cpp76
-rw-r--r--src/widgets/itemviews/qtreeview.h1
-rw-r--r--src/widgets/itemviews/qtreewidget.cpp2
-rw-r--r--src/widgets/itemviews/qtreewidget.h1
-rw-r--r--src/widgets/kernel/kernel.pri5
-rw-r--r--src/widgets/kernel/qapplication.cpp229
-rw-r--r--src/widgets/kernel/qapplication.h6
-rw-r--r--src/widgets/kernel/qapplication_p.h8
-rw-r--r--src/widgets/kernel/qboxlayout.cpp8
-rw-r--r--src/widgets/kernel/qdesktopwidget.cpp128
-rw-r--r--src/widgets/kernel/qdesktopwidget_p.h104
-rw-r--r--src/widgets/kernel/qgesturemanager.cpp4
-rw-r--r--src/widgets/kernel/qgridlayout.cpp2
-rw-r--r--src/widgets/kernel/qlayout.cpp30
-rw-r--r--src/widgets/kernel/qlayout.h9
-rw-r--r--src/widgets/kernel/qlayoutitem.h2
-rw-r--r--src/widgets/kernel/qmacgesturerecognizer.cpp6
-rw-r--r--src/widgets/kernel/qsizepolicy.cpp2
-rw-r--r--src/widgets/kernel/qsizepolicy.h88
-rw-r--r--src/widgets/kernel/qstandardgestures.cpp42
-rw-r--r--src/widgets/kernel/qtestsupport_widgets.cpp74
-rw-r--r--src/widgets/kernel/qtestsupport_widgets.h31
-rw-r--r--src/widgets/kernel/qwhatsthis.cpp8
-rw-r--r--src/widgets/kernel/qwidget.cpp112
-rw-r--r--src/widgets/kernel/qwidget.h6
-rw-r--r--src/widgets/kernel/qwidget_p.h46
-rw-r--r--src/widgets/kernel/qwidgetstatemachine.cpp166
-rw-r--r--src/widgets/kernel/qwidgetsvariant.cpp73
-rw-r--r--src/widgets/kernel/qwidgetwindow.cpp8
-rw-r--r--src/widgets/qt_cmdline.cmake6
-rw-r--r--src/widgets/statemachine/qbasickeyeventtransition.cpp204
-rw-r--r--src/widgets/statemachine/qbasickeyeventtransition_p.h93
-rw-r--r--src/widgets/statemachine/qbasicmouseeventtransition.cpp208
-rw-r--r--src/widgets/statemachine/qkeyeventtransition.cpp174
-rw-r--r--src/widgets/statemachine/qkeyeventtransition.h79
-rw-r--r--src/widgets/statemachine/qmouseeventtransition.cpp202
-rw-r--r--src/widgets/statemachine/qmouseeventtransition.h83
-rw-r--r--src/widgets/statemachine/statemachine.pri16
-rw-r--r--src/widgets/styles/qcommonstyle.cpp87
-rw-r--r--src/widgets/styles/qcommonstyle_p.h1
-rw-r--r--src/widgets/styles/qdrawutil.cpp8
-rw-r--r--src/widgets/styles/qfusionstyle.cpp27
-rw-r--r--src/widgets/styles/qpixmapstyle.cpp8
-rw-r--r--src/widgets/styles/qstyle.cpp13
-rw-r--r--src/widgets/styles/qstyle.h1
-rw-r--r--src/widgets/styles/qstylefactory.cpp8
-rw-r--r--src/widgets/styles/qstylehelper.cpp2
-rw-r--r--src/widgets/styles/qstyleoption.cpp61
-rw-r--r--src/widgets/styles/qstyleoption.h25
-rw-r--r--src/widgets/styles/qstylesheetstyle.cpp29
-rw-r--r--src/widgets/styles/qstylesheetstyle_p.h8
-rw-r--r--src/widgets/styles/qwindowsstyle.cpp10
-rw-r--r--src/widgets/styles/qwindowsstyle_p_p.h2
-rw-r--r--src/widgets/util/qcompleter.cpp2
-rw-r--r--src/widgets/util/qcompleter_p.h9
-rw-r--r--src/widgets/util/qflickgesture.cpp16
-rw-r--r--src/widgets/util/qscroller.cpp4
-rw-r--r--src/widgets/util/qsystemtrayicon_qpa.cpp2
-rw-r--r--src/widgets/util/qsystemtrayicon_x11.cpp2
-rw-r--r--src/widgets/widgets.pro1
-rw-r--r--src/widgets/widgets/qabstractscrollarea.cpp86
-rw-r--r--src/widgets/widgets/qabstractspinbox.cpp2
-rw-r--r--src/widgets/widgets/qcalendarwidget.cpp25
-rw-r--r--src/widgets/widgets/qcombobox.cpp21
-rw-r--r--src/widgets/widgets/qcombobox_p.h36
-rw-r--r--src/widgets/widgets/qdatetimeedit.cpp80
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.h3
-rw-r--r--src/widgets/widgets/qdockwidget.cpp18
-rw-r--r--src/widgets/widgets/qfontcombobox.cpp6
-rw-r--r--src/widgets/widgets/qkeysequenceedit.cpp6
-rw-r--r--src/widgets/widgets/qkeysequenceedit_p.h2
-rw-r--r--src/widgets/widgets/qlabel.cpp4
-rw-r--r--src/widgets/widgets/qlcdnumber.cpp2
-rw-r--r--src/widgets/widgets/qlineedit.cpp50
-rw-r--r--src/widgets/widgets/qlineedit.h3
-rw-r--r--src/widgets/widgets/qlineedit_p.cpp15
-rw-r--r--src/widgets/widgets/qlineedit_p.h1
-rw-r--r--src/widgets/widgets/qmaccocoaviewcontainer_mac.h70
-rw-r--r--src/widgets/widgets/qmaccocoaviewcontainer_mac.mm199
-rw-r--r--src/widgets/widgets/qmacnativewidget_mac.mm166
-rw-r--r--src/widgets/widgets/qmainwindow.cpp2
-rw-r--r--src/widgets/widgets/qmainwindowlayout.cpp32
-rw-r--r--src/widgets/widgets/qmdiarea.cpp6
-rw-r--r--src/widgets/widgets/qmdisubwindow.cpp5
-rw-r--r--src/widgets/widgets/qmenu.cpp23
-rw-r--r--src/widgets/widgets/qmenu.h2
-rw-r--r--src/widgets/widgets/qmenu_mac.mm19
-rw-r--r--src/widgets/widgets/qprogressbar.cpp3
-rw-r--r--src/widgets/widgets/qscrollbar.cpp6
-rw-r--r--src/widgets/widgets/qsplitter.cpp8
-rw-r--r--src/widgets/widgets/qstackedwidget.cpp2
-rw-r--r--src/widgets/widgets/qstackedwidget.h2
-rw-r--r--src/widgets/widgets/qtabbar.cpp8
-rw-r--r--src/widgets/widgets/qtabbar_p.h2
-rw-r--r--src/widgets/widgets/qtabwidget.cpp2
-rw-r--r--src/widgets/widgets/qtabwidget.h2
-rw-r--r--src/widgets/widgets/qtextbrowser.cpp4
-rw-r--r--src/widgets/widgets/qtoolbox.cpp2
-rw-r--r--src/widgets/widgets/qtoolbox.h2
-rw-r--r--src/widgets/widgets/qtoolbutton.cpp2
-rw-r--r--src/widgets/widgets/qtoolbutton.h2
-rw-r--r--src/widgets/widgets/qwidgettextcontrol.cpp4
-rw-r--r--src/widgets/widgets/qwidgettextcontrol_p.h2
-rw-r--r--src/widgets/widgets/widgets.pri8
-rw-r--r--src/winmain/.prev_CMakeLists.txt43
-rw-r--r--src/winmain/CMakeLists.txt27
-rw-r--r--src/winmain/winmain.pro31
-rw-r--r--src/xml/CMakeLists.txt7
-rw-r--r--src/xml/doc/snippets/code/src_xml_dom_qdom.cpp117
-rw-r--r--src/xml/doc/snippets/code/src_xml_dom_qdom_snippet.cpp (renamed from src/gui/doc/snippets/textblock-fragments/mainwindow.h)63
-rw-r--r--src/xml/doc/snippets/simpleparse/main.cpp97
-rw-r--r--src/xml/doc/snippets/snippets.pro4
-rw-r--r--src/xml/doc/src/qt6-changes.qdoc46
-rw-r--r--src/xml/doc/src/qtxml-index.qdoc6
-rw-r--r--src/xml/dom/qdom.cpp154
-rw-r--r--src/xml/dom/qdom.h14
-rw-r--r--src/xml/dom/qdom_p.h11
-rw-r--r--src/xml/dom/qdomhelpers.cpp239
-rw-r--r--src/xml/dom/qdomhelpers_p.h92
-rw-r--r--src/xml/qt_cmdline.cmake0
-rw-r--r--src/xml/sax/qxml.cpp8010
-rw-r--r--src/xml/sax/qxml.h469
-rw-r--r--src/xml/sax/qxml_p.h327
-rw-r--r--src/xml/sax/sax.pri3
-rw-r--r--src/xml/xml.pro1
1788 files changed, 62590 insertions, 81580 deletions
diff --git a/src/3rdparty/CMakeLists.txt b/src/3rdparty/CMakeLists.txt
index d6ef4f3a56..56b81bb7af 100644
--- a/src/3rdparty/CMakeLists.txt
+++ b/src/3rdparty/CMakeLists.txt
@@ -1,17 +1,17 @@
# special case skip regeneration
# The file is maintained manually
-if(QT_FEATURE_png AND NOT QT_FEATURE_system_png)
+if(QT_FEATURE_gui AND QT_FEATURE_png AND NOT QT_FEATURE_system_png)
add_subdirectory(libpng)
endif()
qt_install_3rdparty_library_wrap_config_extra_file(BundledLibpng)
-if(QT_FEATURE_freetype AND NOT QT_FEATURE_system_freetype)
+if(QT_FEATURE_gui AND QT_FEATURE_freetype AND NOT QT_FEATURE_system_freetype)
add_subdirectory(freetype)
endif()
qt_install_3rdparty_library_wrap_config_extra_file(BundledFreetype)
-if(QT_FEATURE_harfbuzz AND NOT QT_FEATURE_system_harfbuzz)
+if(QT_FEATURE_gui AND QT_FEATURE_harfbuzz AND NOT QT_FEATURE_system_harfbuzz)
add_subdirectory(harfbuzz-ng)
endif()
qt_install_3rdparty_library_wrap_config_extra_file(BundledHarfbuzz)
diff --git a/src/3rdparty/_clang-format b/src/3rdparty/_clang-format
new file mode 100644
index 0000000000..5ea3a9f7b8
--- /dev/null
+++ b/src/3rdparty/_clang-format
@@ -0,0 +1,2 @@
+# Ignore formatting of third party code.
+DisableFormat: true
diff --git a/src/3rdparty/forkfd/forkfd_linux.c b/src/3rdparty/forkfd/forkfd_linux.c
index 923ced128d..c86e138b63 100644
--- a/src/3rdparty/forkfd/forkfd_linux.c
+++ b/src/3rdparty/forkfd/forkfd_linux.c
@@ -147,7 +147,7 @@ int system_forkfd(int flags, pid_t *ppid, int *system)
}
*system = 1;
- unsigned long cloneflags = CLONE_PIDFD;
+ unsigned long cloneflags = CLONE_PIDFD | SIGCHLD;
pid = sys_clone(cloneflags, &pidfd);
if (pid < 0)
return pid;
@@ -173,7 +173,7 @@ int system_forkfd_wait(int ffd, struct forkfd_info *info, int ffdoptions, struct
{
siginfo_t si;
int ret;
- int options = __WALL | convertForkfdWaitFlagsToWaitFlags(ffdoptions);
+ int options = convertForkfdWaitFlagsToWaitFlags(ffdoptions);
if ((options & WNOHANG) == 0) {
/* check if the file descriptor is non-blocking */
diff --git a/src/3rdparty/freetype/CMakeLists.txt b/src/3rdparty/freetype/CMakeLists.txt
index 728e9371c7..48d3528546 100644
--- a/src/3rdparty/freetype/CMakeLists.txt
+++ b/src/3rdparty/freetype/CMakeLists.txt
@@ -4,7 +4,7 @@
## BundledFreetype Generic Library:
#####################################################################
-qt_add_3rdparty_library(BundledFreetype
+qt_internal_add_3rdparty_library(BundledFreetype
QMAKE_LIB_NAME freetype
STATIC
INSTALL
@@ -67,36 +67,36 @@ qt_set_symbol_visibility_hidden(BundledFreetype)
## Scopes:
#####################################################################
-qt_extend_target(BundledFreetype CONDITION WIN32
+qt_internal_extend_target(BundledFreetype CONDITION WIN32
SOURCES
src/base/ftsystem.c
)
-qt_extend_target(BundledFreetype CONDITION UNIX
+qt_internal_extend_target(BundledFreetype CONDITION UNIX
SOURCES
builds/unix/ftsystem.c
INCLUDE_DIRECTORIES
builds/unix
)
-qt_extend_target(BundledFreetype CONDITION QT_FEATURE_png
+qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_png
DEFINES
FT_CONFIG_OPTION_USE_PNG
LIBRARIES
WrapPNG::WrapPNG
)
-qt_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledFreetype CONDITION QT_FEATURE_system_zlib
LIBRARIES
ZLIB::ZLIB
)
-qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib
INCLUDE_DIRECTORIES
../zlib/src
)
-qt_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(BundledFreetype CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
LIBRARIES
Qt::Core
)
diff --git a/src/3rdparty/gradle/CMakeLists.txt b/src/3rdparty/gradle/CMakeLists.txt
index d4eaa60838..20c0181403 100644
--- a/src/3rdparty/gradle/CMakeLists.txt
+++ b/src/3rdparty/gradle/CMakeLists.txt
@@ -1,21 +1,21 @@
# special case begin
# special case skip regeneration
-install(
+qt_path_join(destination ${QT_INSTALL_DIR} "src/3rdparty/gradle")
+qt_copy_or_install(
FILES
gradlew
gradlew.bat
+ gradle.properties
DESTINATION
- src/3rdparty/gradle
- COMPONENT
- Devel)
+ "${destination}"
+)
-install(
+qt_copy_or_install(
DIRECTORY
gradle
DESTINATION
- src/3rdparty/gradle
- COMPONENT
- Devel)
+ "${destination}"
+)
# special case end
diff --git a/src/3rdparty/gradle/gradle.pro b/src/3rdparty/gradle/gradle.pro
index ffc2237044..5d8efdcfd3 100644
--- a/src/3rdparty/gradle/gradle.pro
+++ b/src/3rdparty/gradle/gradle.pro
@@ -2,14 +2,21 @@ TEMPLATE = aux
TARGET = dummy # Avoid a conflict with the existing gradle directory
CONFIG -= qt android_install
-gradle.files = \
+gradle_files.files = \
$$PWD/gradlew \
$$PWD/gradlew.bat \
+ $$PWD/gradle.properties
+gradle_dirs.files = \
$$PWD/gradle
-gradle.path = $$[QT_INSTALL_PREFIX]/src/3rdparty/gradle
+gradle_files.path = $$[QT_INSTALL_PREFIX]/src/3rdparty/gradle
+gradle_dirs.path = $${gradle_files.path}
-INSTALLS += gradle
+INSTALLS += gradle_files gradle_dirs
+!prefix_build:!equals(OUT_PWD, $$PWD) {
+ # For COPIES to work, files and directory entries need to be separate objects.
+ COPIES += gradle_files gradle_dirs
+}
!prefix_build:!equals(OUT_PWD, $$PWD) {
RETURN = $$escape_expand(\\n\\t)
diff --git a/src/3rdparty/gradle/gradle.properties b/src/3rdparty/gradle/gradle.properties
new file mode 100644
index 0000000000..554f6aeba1
--- /dev/null
+++ b/src/3rdparty/gradle/gradle.properties
@@ -0,0 +1,9 @@
+# Project-wide Gradle settings.
+# For more details on how to configure your build environment visit
+# http://www.gradle.org/docs/current/userguide/build_environment.html
+# Specifies the JVM arguments used for the daemon process.
+# The setting is particularly useful for tweaking memory settings.
+org.gradle.jvmargs=-Xmx2048m
+
+# Enable Gradle caching
+org.gradle.caching=true
diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
index f8d1a77a75..37b4c00784 100644
--- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## BundledHarfbuzz Generic Library:
#####################################################################
-qt_add_3rdparty_library(BundledHarfbuzz
+qt_internal_add_3rdparty_library(BundledHarfbuzz
QMAKE_LIB_NAME harfbuzz
STATIC
SOURCES
@@ -59,7 +59,7 @@ qt_add_3rdparty_library(BundledHarfbuzz
INCLUDE_DIRECTORIES
.core.includes
PUBLIC_INCLUDE_DIRECTORIES
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
)
qt_disable_warnings(BundledHarfbuzz)
qt_set_symbol_visibility_hidden(BundledHarfbuzz)
@@ -74,19 +74,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
# SHAPERS = "coretext"
-qt_extend_target(BundledHarfbuzz CONDITION UNIX
+qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX
DEFINES
HAVE_PTHREAD
HAVE_SCHED_H
HAVE_SCHED_YIELD
)
-qt_extend_target(BundledHarfbuzz CONDITION WIN32
+qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32
DEFINES
HB_NO_WIN1256
)
-qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
+qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
SOURCES
src/hb-ot.h
src/hb-ot-cff1-table.cc
@@ -147,7 +147,7 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype
HAVE_OT
)
-qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
+qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
SOURCES
src/hb-fallback-shape.cc
DEFINES
diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
index a76cc629c8..37e07f2350 100644
--- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt
+++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt
@@ -4,7 +4,7 @@
## BundledHarfbuzz Generic Library:
#####################################################################
-qt_add_3rdparty_library(BundledHarfbuzz
+qt_internal_add_3rdparty_library(BundledHarfbuzz
QMAKE_LIB_NAME harfbuzz
STATIC
SKIP_AUTOMOC # special case
@@ -61,7 +61,7 @@ qt_add_3rdparty_library(BundledHarfbuzz
$<TARGET_PROPERTY:Core,INCLUDE_DIRECTORIES> # special case
"${CMAKE_CURRENT_SOURCE_DIR}" # special case
PUBLIC_INCLUDE_DIRECTORIES
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/harfbuzz>
)
qt_disable_warnings(BundledHarfbuzz)
qt_set_symbol_visibility_hidden(BundledHarfbuzz)
@@ -76,19 +76,19 @@ qt_set_symbol_visibility_hidden(BundledHarfbuzz)
#### Keys ignored in scope 2:.:.:harfbuzz-ng.pro:APPLE:
# SHAPERS = "coretext"
-qt_extend_target(BundledHarfbuzz CONDITION UNIX
+qt_internal_extend_target(BundledHarfbuzz CONDITION UNIX
DEFINES
HAVE_PTHREAD
HAVE_SCHED_H
HAVE_SCHED_YIELD
)
-qt_extend_target(BundledHarfbuzz CONDITION WIN32
+qt_internal_extend_target(BundledHarfbuzz CONDITION WIN32
DEFINES
HB_NO_WIN1256
)
-qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
+qt_internal_extend_target(BundledHarfbuzz CONDITION TRUE # special case
SOURCES
src/hb-ot.h
src/hb-ot-cff1-table.cc
@@ -149,7 +149,7 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case
HAVE_OT
)
-qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
+qt_internal_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains___fallback
SOURCES
src/hb-fallback-shape.cc
DEFINES
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index 1c6eb992f0..752d349ebc 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -5,7 +5,7 @@ CONFIG += \
hide_symbols \
exceptions_off rtti_off warn_off
-MODULE_INCLUDEPATH += $$PWD/include
+MODULE_INCLUDEPATH += $$PWD/include/harfbuzz
load(qt_helper_lib)
diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri
index 9af79e58dc..364dbb11a6 100644
--- a/src/3rdparty/libjpeg.pri
+++ b/src/3rdparty/libjpeg.pri
@@ -1,6 +1,8 @@
# Disable warnings in 3rdparty code due to unused arguments
gcc: QMAKE_CFLAGS_WARN_ON += -Wno-unused-parameter -Wno-main
+# Do not warn about sprintf, getenv, sscanf ... use
+msvc: DEFINES += _CRT_SECURE_NO_WARNINGS
INCLUDEPATH += \
$$PWD/libjpeg \
diff --git a/src/3rdparty/libjpeg/LICENSE b/src/3rdparty/libjpeg/LICENSE
index 5ca512b34d..99c9aadcc4 100644
--- a/src/3rdparty/libjpeg/LICENSE
+++ b/src/3rdparty/libjpeg/LICENSE
@@ -91,7 +91,7 @@ best of our understanding.
The Modified (3-clause) BSD License
===================================
-Copyright (C)2009-2019 D. R. Commander. All Rights Reserved.
+Copyright (C)2009-2020 D. R. Commander. All Rights Reserved.
Copyright (C)2015 Viktor Szathm√°ry. All Rights Reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/src/3rdparty/libjpeg/jconfig.h b/src/3rdparty/libjpeg/jconfig.h
index 8ed5620ca3..e25dba4b0f 100644
--- a/src/3rdparty/libjpeg/jconfig.h
+++ b/src/3rdparty/libjpeg/jconfig.h
@@ -2,9 +2,9 @@
#define JPEG_LIB_VERSION 80
-#define LIBJPEG_TURBO_VERSION 2.0.4
+#define LIBJPEG_TURBO_VERSION 2.0.5
-#define LIBJPEG_TURBO_VERSION_NUMBER 2000002
+#define LIBJPEG_TURBO_VERSION_NUMBER 2000005
#define C_ARITH_CODING_SUPPORTED 1
diff --git a/src/3rdparty/libjpeg/jconfigint.h b/src/3rdparty/libjpeg/jconfigint.h
index d945be285b..d118c9f909 100644
--- a/src/3rdparty/libjpeg/jconfigint.h
+++ b/src/3rdparty/libjpeg/jconfigint.h
@@ -8,7 +8,7 @@
#define PACKAGE_NAME "libjpeg-turbo"
-#define VERSION "2.0.4"
+#define VERSION "2.0.5"
#if SIZE_MAX == 0xffffffff
#define SIZEOF_SIZE_T 4
diff --git a/src/3rdparty/libjpeg/qt_attribution.json b/src/3rdparty/libjpeg/qt_attribution.json
index 1eb095128a..796829e215 100644
--- a/src/3rdparty/libjpeg/qt_attribution.json
+++ b/src/3rdparty/libjpeg/qt_attribution.json
@@ -6,11 +6,11 @@
"Description": "The Independent JPEG Group's JPEG software",
"Homepage": "http://libjpeg-turbo.virtualgl.org/",
- "Version": "2.0.4",
+ "Version": "2.0.5",
"License": "Independent JPEG Group License",
"LicenseId": "IJG",
"LicenseFile": "LICENSE",
- "Copyright": "Copyright (C) 2009-2019 D. R. Commander
+ "Copyright": "Copyright (C) 2009-2020 D. R. Commander
Copyright (C) 2011-2016 Siarhei Siamashka
Copyright (C) 2015-2016, 2018 Matthieu Darbois
Copyright (C) 2015 Intel Corporation
diff --git a/src/3rdparty/libjpeg/src/ChangeLog.md b/src/3rdparty/libjpeg/src/ChangeLog.md
index 4d1219e555..59fb2de96a 100644
--- a/src/3rdparty/libjpeg/src/ChangeLog.md
+++ b/src/3rdparty/libjpeg/src/ChangeLog.md
@@ -1,3 +1,33 @@
+2.0.5
+=====
+
+### Significant changes relative to 2.0.4:
+
+1. Worked around issues in the MIPS DSPr2 SIMD extensions that caused failures
+in the libjpeg-turbo regression tests. Specifically, the
+`jsimd_h2v1_downsample_dspr2()` and `jsimd_h2v2_downsample_dspr2()` functions
+in the MIPS DSPr2 SIMD extensions are now disabled until/unless they can be
+fixed, and other functions that are incompatible with big endian MIPS CPUs are
+disabled when building libjpeg-turbo for such CPUs.
+
+2. Fixed an oversight in the `TJCompressor.compress(int)` method in the
+TurboJPEG Java API that caused an error ("java.lang.IllegalStateException: No
+source image is associated with this instance") when attempting to use that
+method to compress a YUV image.
+
+3. Fixed an issue (CVE-2020-13790) in the PPM reader that caused a buffer
+overrun in cjpeg, TJBench, or the `tjLoadImage()` function if one of the values
+in a binary PPM/PGM input file exceeded the maximum value defined in the file's
+header and that maximum value was less than 255. libjpeg-turbo 1.5.0 already
+included a similar fix for binary PPM/PGM files with maximum values greater
+than 255.
+
+4. The TurboJPEG API library's global error handler, which is used in functions
+such as `tjBufSize()` and `tjLoadImage()` that do not require a TurboJPEG
+instance handle, is now thread-safe on platforms that support thread-local
+storage.
+
+
2.0.4
=====
@@ -562,10 +592,10 @@ application was linked against.
3. Fixed a couple of issues in the PPM reader that would cause buffer overruns
in cjpeg if one of the values in a binary PPM/PGM input file exceeded the
-maximum value defined in the file's header. libjpeg-turbo 1.4.2 already
-included a similar fix for ASCII PPM/PGM files. Note that these issues were
-not security bugs, since they were confined to the cjpeg program and did not
-affect any of the libjpeg-turbo libraries.
+maximum value defined in the file's header and that maximum value was greater
+than 255. libjpeg-turbo 1.4.2 already included a similar fix for ASCII PPM/PGM
+files. Note that these issues were not security bugs, since they were confined
+to the cjpeg program and did not affect any of the libjpeg-turbo libraries.
4. Fixed an issue whereby attempting to decompress a JPEG file with a corrupt
header using the `tjDecompressToYUV2()` function would cause the function to
diff --git a/src/3rdparty/libjpeg/src/jconfigint.h.in b/src/3rdparty/libjpeg/src/jconfigint.h.in
index 55df053676..68cbc2a505 100644
--- a/src/3rdparty/libjpeg/src/jconfigint.h.in
+++ b/src/3rdparty/libjpeg/src/jconfigint.h.in
@@ -7,6 +7,9 @@
/* How to obtain function inlining. */
#define INLINE @INLINE@
+/* How to obtain thread-local storage */
+#define THREAD_LOCAL @THREAD_LOCAL@
+
/* Define to the full name of this package. */
#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
diff --git a/src/3rdparty/libjpeg/src/jdatadst.c b/src/3rdparty/libjpeg/src/jdatadst.c
index 3168b9693c..246fffb58a 100644
--- a/src/3rdparty/libjpeg/src/jdatadst.c
+++ b/src/3rdparty/libjpeg/src/jdatadst.c
@@ -143,8 +143,7 @@ empty_mem_output_buffer(j_compress_ptr cinfo)
MEMCOPY(nextbuffer, dest->buffer, dest->bufsize);
- if (dest->newbuffer != NULL)
- free(dest->newbuffer);
+ free(dest->newbuffer);
dest->newbuffer = nextbuffer;
diff --git a/src/3rdparty/libjpeg/src/jversion.h b/src/3rdparty/libjpeg/src/jversion.h
index 191fb6bb54..ab4a2c5703 100644
--- a/src/3rdparty/libjpeg/src/jversion.h
+++ b/src/3rdparty/libjpeg/src/jversion.h
@@ -4,7 +4,7 @@
* This file was part of the Independent JPEG Group's software:
* Copyright (C) 1991-2012, Thomas G. Lane, Guido Vollbeding.
* libjpeg-turbo Modifications:
- * Copyright (C) 2010, 2012-2019, D. R. Commander.
+ * Copyright (C) 2010, 2012-2020, D. R. Commander.
* For conditions of distribution and use, see the accompanying README.ijg
* file.
*
@@ -36,7 +36,7 @@
*/
#define JCOPYRIGHT \
- "Copyright (C) 2009-2019 D. R. Commander\n" \
+ "Copyright (C) 2009-2020 D. R. Commander\n" \
"Copyright (C) 2011-2016 Siarhei Siamashka\n" \
"Copyright (C) 2015-2016, 2018 Matthieu Darbois\n" \
"Copyright (C) 2015 Intel Corporation\n" \
@@ -49,4 +49,4 @@
"Copyright (C) 1991-2016 Thomas G. Lane, Guido Vollbeding"
#define JCOPYRIGHT_SHORT \
- "Copyright (C) 1991-2019 The libjpeg-turbo Project and many others"
+ "Copyright (C) 1991-2020 The libjpeg-turbo Project and many others"
diff --git a/src/3rdparty/libpng/CMakeLists.txt b/src/3rdparty/libpng/CMakeLists.txt
index 24fca5d925..9ef367563b 100644
--- a/src/3rdparty/libpng/CMakeLists.txt
+++ b/src/3rdparty/libpng/CMakeLists.txt
@@ -4,7 +4,7 @@
## BundledLibpng Generic Library:
#####################################################################
-qt_add_3rdparty_library(BundledLibpng
+qt_internal_add_3rdparty_library(BundledLibpng
QMAKE_LIB_NAME libpng
STATIC
INSTALL
@@ -39,17 +39,17 @@ qt_set_symbol_visibility_hidden(BundledLibpng)
## Scopes:
#####################################################################
-qt_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledLibpng CONDITION QT_FEATURE_system_zlib
LIBRARIES
ZLIB::ZLIB
)
-qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib
+qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib
INCLUDE_DIRECTORIES
../zlib/src
)
-qt_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
+qt_internal_extend_target(BundledLibpng CONDITION NOT QT_FEATURE_system_zlib AND NOT no_core_dep
LIBRARIES
Qt::Core
)
diff --git a/src/3rdparty/libpng/qt_attribution.json b/src/3rdparty/libpng/qt_attribution.json
index b13f0c3527..612aa67791 100644
--- a/src/3rdparty/libpng/qt_attribution.json
+++ b/src/3rdparty/libpng/qt_attribution.json
@@ -7,8 +7,8 @@
"Description": "libpng is the official PNG reference library.",
"Homepage": "http://www.libpng.org/pub/png/libpng.html",
"Version": "1.6.37",
- "License": "libpng License and libpng License 2",
- "LicenseId": "Libpng AND Libpng2",
+ "License": "libpng License and PNG Reference Library version 2",
+ "LicenseId": "Libpng AND libpng-2.0",
"LicenseFile": "LICENSE",
"Copyright": "Copyright (c) 1998-2018 Glenn Randers-Pehrson
Copyright (c) 2000-2017 Simon-Pierre Cadieux
diff --git a/src/3rdparty/pcre2/.prev_CMakeLists.txt b/src/3rdparty/pcre2/.prev_CMakeLists.txt
index 5efac810c7..e84899c227 100644
--- a/src/3rdparty/pcre2/.prev_CMakeLists.txt
+++ b/src/3rdparty/pcre2/.prev_CMakeLists.txt
@@ -4,7 +4,7 @@
## BundledPcre2 Generic Library:
#####################################################################
-qt_add_3rdparty_library(BundledPcre2
+qt_internal_add_3rdparty_library(BundledPcre2
QMAKE_LIB_NAME pcre2
STATIC
SOURCES
@@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2)
## Scopes:
#####################################################################
-qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
+qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
+qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION WIN32
PUBLIC_DEFINES
PCRE2_STATIC
)
diff --git a/src/3rdparty/pcre2/CMakeLists.txt b/src/3rdparty/pcre2/CMakeLists.txt
index 575424c887..23b6e738cd 100644
--- a/src/3rdparty/pcre2/CMakeLists.txt
+++ b/src/3rdparty/pcre2/CMakeLists.txt
@@ -4,7 +4,7 @@
## BundledPcre2 Generic Library:
#####################################################################
-qt_add_3rdparty_library(BundledPcre2
+qt_internal_add_3rdparty_library(BundledPcre2
QMAKE_LIB_NAME pcre2
STATIC
SOURCES
@@ -52,27 +52,27 @@ qt_set_symbol_visibility_hidden(BundledPcre2)
## Scopes:
#####################################################################
-qt_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
+qt_internal_extend_target(BundledPcre2 CONDITION QNX OR UIKIT
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm") AND WIN32
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION (TEST_architecture_arch STREQUAL "arm64") AND WIN32
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
+qt_internal_extend_target(BundledPcre2 CONDITION MACOS AND (TEST_architecture_arch STREQUAL "arm64")
DEFINES
PCRE2_DISABLE_JIT
)
-qt_extend_target(BundledPcre2 CONDITION WIN32
+qt_internal_extend_target(BundledPcre2 CONDITION WIN32
PUBLIC_DEFINES
PCRE2_STATIC
)
diff --git a/src/3rdparty/rfc6234/sha.h b/src/3rdparty/rfc6234/sha.h
index 9c26f0253c..1ffd688079 100644
--- a/src/3rdparty/rfc6234/sha.h
+++ b/src/3rdparty/rfc6234/sha.h
@@ -70,8 +70,7 @@
*
*/
-// stdint.h include commented out by Nokia, it is not available on all platforms.
-// #include <stdint.h>
+#include <stdint.h>
/*
* If you do not have the ISO standard stdint.h header file, then you
* must typedef the following:
diff --git a/src/3rdparty/sqlite/qt_attribution.json b/src/3rdparty/sqlite/qt_attribution.json
index 1e3a92aee7..c544716cbb 100644
--- a/src/3rdparty/sqlite/qt_attribution.json
+++ b/src/3rdparty/sqlite/qt_attribution.json
@@ -6,8 +6,8 @@
"Description": "SQLite is a small C library that implements a self-contained, embeddable, zero-configuration SQL database engine.",
"Homepage": "https://www.sqlite.org/",
- "Version": "3.32.3",
- "DownloadLocation": "https://www.sqlite.org/2020/sqlite-amalgamation-3320300.zip",
+ "Version": "3.33.0",
+ "DownloadLocation": "https://www.sqlite.org/2020/sqlite-amalgamation-3330000.zip",
"License": "Public Domain",
"Copyright": "The authors disclaim copyright to the source code. However, a license can be obtained if needed."
}
diff --git a/src/3rdparty/sqlite/sqlite3.c b/src/3rdparty/sqlite/sqlite3.c
index 50e256445b..a82744931c 100644
--- a/src/3rdparty/sqlite/sqlite3.c
+++ b/src/3rdparty/sqlite/sqlite3.c
@@ -1,6 +1,6 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
-** version 3.32.3. By combining all the individual C code files into this
+** version 3.33.0. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation
** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements
@@ -62,7 +62,7 @@
#define CTIMEOPT_VAL2(opt) CTIMEOPT_VAL2_(opt)
/*
-** An array of names of all compile-time options. This array should
+** An array of names of all compile-time options. This array should
** be sorted A-Z.
**
** This array looks large, but in a typical installation actually uses
@@ -71,8 +71,8 @@
*/
static const char * const sqlite3azCompileOpt[] = {
-/*
-** BEGIN CODE GENERATED BY tool/mkctime.tcl
+/*
+** BEGIN CODE GENERATED BY tool/mkctime.tcl
*/
#if SQLITE_32BIT_ROWID
"32BIT_ROWID",
@@ -774,8 +774,8 @@ static const char * const sqlite3azCompileOpt[] = {
#if SQLITE_ZERO_MALLOC
"ZERO_MALLOC",
#endif
-/*
-** END CODE GENERATED BY tool/mkctime.tcl
+/*
+** END CODE GENERATED BY tool/mkctime.tcl
*/
};
@@ -825,10 +825,10 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt){
**
** PREVENTS-HARMLESS-OVERREAD - This branch prevents a buffer overread
** that would be harmless and undetectable
-** if it did occur.
+** if it did occur.
**
** In all cases, the special comment must be enclosed in the usual
-** slash-asterisk...asterisk-slash comment marks, with no spaces between the
+** slash-asterisk...asterisk-slash comment marks, with no spaces between the
** asterisks and the comment text.
*/
@@ -1000,6 +1000,15 @@ SQLITE_PRIVATE const char **sqlite3CompileOptions(int *pnOpt){
#endif
/*
+** Macro to disable warnings about missing "break" at the end of a "case".
+*/
+#if GCC_VERSION>=7000000
+# define deliberate_fall_through __attribute__((fallthrough));
+#else
+# define deliberate_fall_through
+#endif
+
+/*
** For MinGW, check to see if we can include the header file containing its
** version information, among other things. Normally, this internal MinGW
** header file would [only] be included automatically by other MinGW header
@@ -1147,7 +1156,7 @@ extern "C" {
** be held constant and Z will be incremented or else Y will be incremented
** and Z will be reset to zero.
**
-** Since [version 3.6.18] ([dateof:3.6.18]),
+** Since [version 3.6.18] ([dateof:3.6.18]),
** SQLite source code has been stored in the
** <a href="http://www.fossil-scm.org/">Fossil configuration management
** system</a>. ^The SQLITE_SOURCE_ID macro evaluates to
@@ -1162,9 +1171,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
-#define SQLITE_VERSION "3.32.3"
-#define SQLITE_VERSION_NUMBER 3032003
-#define SQLITE_SOURCE_ID "2020-06-18 14:00:33 7ebdfa80be8e8e73324b8d66b3460222eb74c7e9dfd655b48d6ca7e1933cc8fd"
+#define SQLITE_VERSION "3.33.0"
+#define SQLITE_VERSION_NUMBER 3033000
+#define SQLITE_SOURCE_ID "2020-08-14 13:23:32 fca8dc8b578f215a969cd899336378966156154710873e68b3d9ac5881b0ff3f"
/*
** CAPI3REF: Run-Time Library Version Numbers
@@ -1190,8 +1199,8 @@ extern "C" {
** function is provided for use in DLLs since DLL users usually do not have
** direct access to string constants within the DLL. ^The
** sqlite3_libversion_number() function returns an integer equal to
-** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
-** a pointer to a string constant whose value is the same as the
+** [SQLITE_VERSION_NUMBER]. ^(The sqlite3_sourceid() function returns
+** a pointer to a string constant whose value is the same as the
** [SQLITE_SOURCE_ID] C preprocessor macro. Except if SQLite is built
** using an edited copy of [the amalgamation], then the last four characters
** of the hash might be different from [SQLITE_SOURCE_ID].)^
@@ -1206,20 +1215,20 @@ SQLITE_API int sqlite3_libversion_number(void);
/*
** CAPI3REF: Run-Time Library Compilation Options Diagnostics
**
-** ^The sqlite3_compileoption_used() function returns 0 or 1
-** indicating whether the specified option was defined at
-** compile time. ^The SQLITE_ prefix may be omitted from the
-** option name passed to sqlite3_compileoption_used().
+** ^The sqlite3_compileoption_used() function returns 0 or 1
+** indicating whether the specified option was defined at
+** compile time. ^The SQLITE_ prefix may be omitted from the
+** option name passed to sqlite3_compileoption_used().
**
** ^The sqlite3_compileoption_get() function allows iterating
** over the list of options that were defined at compile time by
** returning the N-th compile time option string. ^If N is out of range,
-** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
-** prefix is omitted from any strings returned by
+** sqlite3_compileoption_get() returns a NULL pointer. ^The SQLITE_
+** prefix is omitted from any strings returned by
** sqlite3_compileoption_get().
**
** ^Support for the diagnostic functions sqlite3_compileoption_used()
-** and sqlite3_compileoption_get() may be omitted by specifying the
+** and sqlite3_compileoption_get() may be omitted by specifying the
** [SQLITE_OMIT_COMPILEOPTION_DIAGS] option at compile time.
**
** See also: SQL functions [sqlite_compileoption_used()] and
@@ -1243,7 +1252,7 @@ SQLITE_API const char *sqlite3_compileoption_get(int N);
** SQLite can be compiled with or without mutexes. When
** the [SQLITE_THREADSAFE] C preprocessor macro is 1 or 2, mutexes
** are enabled and SQLite is threadsafe. When the
-** [SQLITE_THREADSAFE] macro is 0,
+** [SQLITE_THREADSAFE] macro is 0,
** the mutexes are omitted. Without the mutexes, it is not safe
** to use SQLite concurrently from more than one thread.
**
@@ -1300,14 +1309,14 @@ typedef struct sqlite3 sqlite3;
**
** ^The sqlite3_int64 and sqlite_int64 types can store integer values
** between -9223372036854775808 and +9223372036854775807 inclusive. ^The
-** sqlite3_uint64 and sqlite_uint64 types can store integer values
+** sqlite3_uint64 and sqlite_uint64 types can store integer values
** between 0 and +18446744073709551615 inclusive.
*/
#ifdef SQLITE_INT64_TYPE
typedef SQLITE_INT64_TYPE sqlite_int64;
# ifdef SQLITE_UINT64_TYPE
typedef SQLITE_UINT64_TYPE sqlite_uint64;
-# else
+# else
typedef unsigned SQLITE_INT64_TYPE sqlite_uint64;
# endif
#elif defined(_MSC_VER) || defined(__BORLANDC__)
@@ -1339,7 +1348,7 @@ typedef sqlite_uint64 sqlite3_uint64;
** resources are deallocated.
**
** Ideally, applications should [sqlite3_finalize | finalize] all
-** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and
+** [prepared statements], [sqlite3_blob_close | close] all [BLOB handles], and
** [sqlite3_backup_finish | finish] all [sqlite3_backup] objects associated
** with the [sqlite3] object prior to attempting to close the object.
** ^If the database connection is associated with unfinalized prepared
@@ -1383,7 +1392,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
** The sqlite3_exec() interface is a convenience wrapper around
** [sqlite3_prepare_v2()], [sqlite3_step()], and [sqlite3_finalize()],
** that allows an application to run multiple statements of SQL
-** without having to use a lot of C code.
+** without having to use a lot of C code.
**
** ^The sqlite3_exec() interface runs zero or more UTF-8 encoded,
** semicolon-separate SQL statements passed into its 2nd argument,
@@ -1423,7 +1432,7 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**);
** from [sqlite3_column_name()].
**
** ^If the 2nd parameter to sqlite3_exec() is a NULL pointer, a pointer
-** to an empty string, or a pointer that contains only whitespace and/or
+** to an empty string, or a pointer that contains only whitespace and/or
** SQL comments, then no SQL statements are evaluated and the database
** is not changed.
**
@@ -1603,7 +1612,7 @@ SQLITE_API int sqlite3_exec(
#define SQLITE_OPEN_MAIN_JOURNAL 0x00000800 /* VFS only */
#define SQLITE_OPEN_TEMP_JOURNAL 0x00001000 /* VFS only */
#define SQLITE_OPEN_SUBJOURNAL 0x00002000 /* VFS only */
-#define SQLITE_OPEN_MASTER_JOURNAL 0x00004000 /* VFS only */
+#define SQLITE_OPEN_SUPER_JOURNAL 0x00004000 /* VFS only */
#define SQLITE_OPEN_NOMUTEX 0x00008000 /* Ok for sqlite3_open_v2() */
#define SQLITE_OPEN_FULLMUTEX 0x00010000 /* Ok for sqlite3_open_v2() */
#define SQLITE_OPEN_SHAREDCACHE 0x00020000 /* Ok for sqlite3_open_v2() */
@@ -1612,6 +1621,9 @@ SQLITE_API int sqlite3_exec(
#define SQLITE_OPEN_NOFOLLOW 0x01000000 /* Ok for sqlite3_open_v2() */
/* Reserved: 0x00F00000 */
+/* Legacy compatibility: */
+#define SQLITE_OPEN_MASTER_JOURNAL 0x00004000 /* VFS only */
+
/*
** CAPI3REF: Device Characteristics
@@ -1708,7 +1720,7 @@ SQLITE_API int sqlite3_exec(
/*
** CAPI3REF: OS Interface Open File Handle
**
-** An [sqlite3_file] object represents an open file in the
+** An [sqlite3_file] object represents an open file in the
** [sqlite3_vfs | OS interface layer]. Individual OS interface
** implementations will
** want to subclass this object by appending additional fields
@@ -1730,7 +1742,7 @@ struct sqlite3_file {
** This object defines the methods used to perform various operations
** against the open file represented by the [sqlite3_file] object.
**
-** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element
+** If the [sqlite3_vfs.xOpen] method sets the sqlite3_file.pMethods element
** to a non-NULL pointer, then the sqlite3_io_methods.xClose method
** may be invoked even if the [sqlite3_vfs.xOpen] reported that it failed. The
** only way to prevent a call to xClose following a failed [sqlite3_vfs.xOpen]
@@ -1880,7 +1892,7 @@ struct sqlite3_io_methods {
** <li>[[SQLITE_FCNTL_CHUNK_SIZE]]
** The [SQLITE_FCNTL_CHUNK_SIZE] opcode is used to request that the VFS
** extends and truncates the database file in chunks of a size specified
-** by the user. The fourth argument to [sqlite3_file_control()] should
+** by the user. The fourth argument to [sqlite3_file_control()] should
** point to an integer (type int) containing the new chunk-size to use
** for the nominated database. Allocating database file space in large
** chunks (say 1MB at a time), may reduce file-system fragmentation and
@@ -1903,24 +1915,24 @@ struct sqlite3_io_methods {
** <li>[[SQLITE_FCNTL_SYNC]]
** The [SQLITE_FCNTL_SYNC] opcode is generated internally by SQLite and
** sent to the VFS immediately before the xSync method is invoked on a
-** database file descriptor. Or, if the xSync method is not invoked
-** because the user has configured SQLite with
-** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place
+** database file descriptor. Or, if the xSync method is not invoked
+** because the user has configured SQLite with
+** [PRAGMA synchronous | PRAGMA synchronous=OFF] it is invoked in place
** of the xSync method. In most cases, the pointer argument passed with
** this file-control is NULL. However, if the database file is being synced
** as part of a multi-database commit, the argument points to a nul-terminated
-** string containing the transactions master-journal file name. VFSes that
-** do not need this signal should silently ignore this opcode. Applications
-** should not call [sqlite3_file_control()] with this opcode as doing so may
-** disrupt the operation of the specialized VFSes that do require it.
+** string containing the transactions super-journal file name. VFSes that
+** do not need this signal should silently ignore this opcode. Applications
+** should not call [sqlite3_file_control()] with this opcode as doing so may
+** disrupt the operation of the specialized VFSes that do require it.
**
** <li>[[SQLITE_FCNTL_COMMIT_PHASETWO]]
** The [SQLITE_FCNTL_COMMIT_PHASETWO] opcode is generated internally by SQLite
** and sent to the VFS after a transaction has been committed immediately
** but before the database is unlocked. VFSes that do not need this signal
** should silently ignore this opcode. Applications should not call
-** [sqlite3_file_control()] with this opcode as doing so may disrupt the
-** operation of the specialized VFSes that do require it.
+** [sqlite3_file_control()] with this opcode as doing so may disrupt the
+** operation of the specialized VFSes that do require it.
**
** <li>[[SQLITE_FCNTL_WIN32_AV_RETRY]]
** ^The [SQLITE_FCNTL_WIN32_AV_RETRY] opcode is used to configure automatic
@@ -1968,13 +1980,13 @@ struct sqlite3_io_methods {
** <li>[[SQLITE_FCNTL_OVERWRITE]]
** ^The [SQLITE_FCNTL_OVERWRITE] opcode is invoked by SQLite after opening
** a write transaction to indicate that, unless it is rolled back for some
-** reason, the entire database file will be overwritten by the current
+** reason, the entire database file will be overwritten by the current
** transaction. This is used by VACUUM operations.
**
** <li>[[SQLITE_FCNTL_VFSNAME]]
** ^The [SQLITE_FCNTL_VFSNAME] opcode can be used to obtain the names of
** all [VFSes] in the VFS stack. The names are of all VFS shims and the
-** final bottom-level VFS are written into memory obtained from
+** final bottom-level VFS are written into memory obtained from
** [sqlite3_malloc()] and the result is stored in the char* variable
** that the fourth parameter of [sqlite3_file_control()] points to.
** The caller is responsible for freeing the memory when done. As with
@@ -1993,7 +2005,7 @@ struct sqlite3_io_methods {
** upper-most shim only.
**
** <li>[[SQLITE_FCNTL_PRAGMA]]
-** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA]
+** ^Whenever a [PRAGMA] statement is parsed, an [SQLITE_FCNTL_PRAGMA]
** file control is sent to the open [sqlite3_file] object corresponding
** to the database file to which the pragma statement refers. ^The argument
** to the [SQLITE_FCNTL_PRAGMA] file control is an array of
@@ -2004,7 +2016,7 @@ struct sqlite3_io_methods {
** of the char** argument point to a string obtained from [sqlite3_mprintf()]
** or the equivalent and that string will become the result of the pragma or
** the error message if the pragma fails. ^If the
-** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
+** [SQLITE_FCNTL_PRAGMA] file control returns [SQLITE_NOTFOUND], then normal
** [PRAGMA] processing continues. ^If the [SQLITE_FCNTL_PRAGMA]
** file control returns [SQLITE_OK], then the parser assumes that the
** VFS has handled the PRAGMA itself and the parser generates a no-op
@@ -2044,7 +2056,7 @@ struct sqlite3_io_methods {
** The argument is a pointer to a value of type sqlite3_int64 that
** is an advisory maximum number of bytes in the file to memory map. The
** pointer is overwritten with the old value. The limit is not changed if
-** the value originally pointed to is negative, and so the current limit
+** the value originally pointed to is negative, and so the current limit
** can be queried by passing in a pointer to a negative number. This
** file-control is used internally to implement [PRAGMA mmap_size].
**
@@ -2088,7 +2100,7 @@ struct sqlite3_io_methods {
** <li>[[SQLITE_FCNTL_RBU]]
** The [SQLITE_FCNTL_RBU] opcode is implemented by the special VFS used by
** the RBU extension only. All other VFS should return SQLITE_NOTFOUND for
-** this opcode.
+** this opcode.
**
** <li>[[SQLITE_FCNTL_BEGIN_ATOMIC_WRITE]]
** If the [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] opcode returns SQLITE_OK, then
@@ -2105,7 +2117,7 @@ struct sqlite3_io_methods {
**
** <li>[[SQLITE_FCNTL_COMMIT_ATOMIC_WRITE]]
** The [SQLITE_FCNTL_COMMIT_ATOMIC_WRITE] opcode causes all write
-** operations since the previous successful call to
+** operations since the previous successful call to
** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be performed atomically.
** This file control returns [SQLITE_OK] if and only if the writes were
** all performed successfully and have been committed to persistent storage.
@@ -2117,7 +2129,7 @@ struct sqlite3_io_methods {
**
** <li>[[SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE]]
** The [SQLITE_FCNTL_ROLLBACK_ATOMIC_WRITE] opcode causes all write
-** operations since the previous successful call to
+** operations since the previous successful call to
** [SQLITE_FCNTL_BEGIN_ATOMIC_WRITE] to be rolled back.
** ^This file control takes the file descriptor out of batch write mode
** so that all subsequent write operations are independent.
@@ -2126,8 +2138,8 @@ struct sqlite3_io_methods {
**
** <li>[[SQLITE_FCNTL_LOCK_TIMEOUT]]
** The [SQLITE_FCNTL_LOCK_TIMEOUT] opcode is used to configure a VFS
-** to block for up to M milliseconds before failing when attempting to
-** obtain a file lock using the xLock or xShmLock methods of the VFS.
+** to block for up to M milliseconds before failing when attempting to
+** obtain a file lock using the xLock or xShmLock methods of the VFS.
** The parameter is a pointer to a 32-bit signed integer that contains
** the value that M is to be set to. Before returning, the 32-bit signed
** integer is overwritten with the previous value of M.
@@ -2285,14 +2297,14 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;
** the [sqlite3_file] can safely store a pointer to the
** filename if it needs to remember the filename for some reason.
** If the zFilename parameter to xOpen is a NULL pointer then xOpen
-** must invent its own temporary name for the file. ^Whenever the
+** must invent its own temporary name for the file. ^Whenever the
** xFilename parameter is NULL it will also be the case that the
** flags parameter will include [SQLITE_OPEN_DELETEONCLOSE].
**
** The flags argument to xOpen() includes all bits set in
** the flags argument to [sqlite3_open_v2()]. Or if [sqlite3_open()]
** or [sqlite3_open16()] is used, then flags includes at least
-** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE].
+** [SQLITE_OPEN_READWRITE] | [SQLITE_OPEN_CREATE].
** If xOpen() opens a file read-only then it sets *pOutFlags to
** include [SQLITE_OPEN_READONLY]. Other bits in *pOutFlags may be set.
**
@@ -2306,7 +2318,7 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;
** <li> [SQLITE_OPEN_TEMP_JOURNAL]
** <li> [SQLITE_OPEN_TRANSIENT_DB]
** <li> [SQLITE_OPEN_SUBJOURNAL]
-** <li> [SQLITE_OPEN_MASTER_JOURNAL]
+** <li> [SQLITE_OPEN_SUPER_JOURNAL]
** <li> [SQLITE_OPEN_WAL]
** </ul>)^
**
@@ -2334,10 +2346,10 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;
** ^The [SQLITE_OPEN_EXCLUSIVE] flag is always used in conjunction
** with the [SQLITE_OPEN_CREATE] flag, which are both directly
** analogous to the O_EXCL and O_CREAT flags of the POSIX open()
-** API. The SQLITE_OPEN_EXCLUSIVE flag, when paired with the
+** API. The SQLITE_OPEN_EXCLUSIVE flag, when paired with the
** SQLITE_OPEN_CREATE, is used to indicate that file should always
** be created, and that it is an error if it already exists.
-** It is <i>not</i> used to indicate the file should be opened
+** It is <i>not</i> used to indicate the file should be opened
** for exclusive access.
**
** ^At least szOsFile bytes of memory are allocated by SQLite
@@ -2361,7 +2373,7 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;
** non-zero error code if there is an I/O error or if the name of
** the file given in the second argument is illegal. If SQLITE_OK
** is returned, then non-zero or zero is written into *pResOut to indicate
-** whether or not the file is accessible.
+** whether or not the file is accessible.
**
** ^SQLite will always allocate at least mxPathname+1 bytes for the
** output buffer xFullPathname. The exact size of the output buffer
@@ -2381,16 +2393,16 @@ typedef struct sqlite3_api_routines sqlite3_api_routines;
** method returns a Julian Day Number for the current date and time as
** a floating point value.
** ^The xCurrentTimeInt64() method returns, as an integer, the Julian
-** Day Number multiplied by 86400000 (the number of milliseconds in
-** a 24-hour day).
+** Day Number multiplied by 86400000 (the number of milliseconds in
+** a 24-hour day).
** ^SQLite will use the xCurrentTimeInt64() method to get the current
-** date and time if that method is available (if iVersion is 2 or
+** date and time if that method is available (if iVersion is 2 or
** greater and the function pointer is not NULL) and will fall back
** to xCurrentTime() if xCurrentTimeInt64() is unavailable.
**
** ^The xSetSystemCall(), xGetSystemCall(), and xNestSystemCall() interfaces
** are not used by the SQLite core. These optional interfaces are provided
-** by some VFSes to facilitate testing of the VFS code. By overriding
+** by some VFSes to facilitate testing of the VFS code. By overriding
** system calls with functions under its control, a test program can
** simulate faults and error conditions that would otherwise be difficult
** or impossible to induce. The set of system calls that can be overridden
@@ -2437,7 +2449,7 @@ struct sqlite3_vfs {
/*
** The methods above are in versions 1 through 3 of the sqlite_vfs object.
** New fields may be appended in future versions. The iVersion
- ** value will increment whenever this happens.
+ ** value will increment whenever this happens.
*/
};
@@ -2481,7 +2493,7 @@ struct sqlite3_vfs {
** </ul>
**
** When unlocking, the same SHARED or EXCLUSIVE flag must be supplied as
-** was given on the corresponding lock.
+** was given on the corresponding lock.
**
** The xShmLock method can transition between unlocked and SHARED or
** between unlocked and EXCLUSIVE. It cannot transition between SHARED
@@ -2626,7 +2638,7 @@ SQLITE_API int sqlite3_config(int, ...);
** [database connection] (specified in the first argument).
**
** The second argument to sqlite3_db_config(D,V,...) is the
-** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code
+** [SQLITE_DBCONFIG_LOOKASIDE | configuration verb] - an integer code
** that indicates what aspect of the [database connection] is being configured.
** Subsequent arguments vary depending on the configuration verb.
**
@@ -2644,7 +2656,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
** This object is used in only one place in the SQLite interface.
** A pointer to an instance of this object is the argument to
** [sqlite3_config()] when the configuration option is
-** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC].
+** [SQLITE_CONFIG_MALLOC] or [SQLITE_CONFIG_GETMALLOC].
** By creating an instance of this object
** and passing it to [sqlite3_config]([SQLITE_CONFIG_MALLOC])
** during configuration, an application can specify an alternative
@@ -2674,7 +2686,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
** allocators round up memory allocations at least to the next multiple
** of 8. Some allocators round up to a larger multiple or to a power of 2.
** Every memory allocation request coming in through [sqlite3_malloc()]
-** or [sqlite3_realloc()] first calls xRoundup. If xRoundup returns 0,
+** or [sqlite3_realloc()] first calls xRoundup. If xRoundup returns 0,
** that causes the corresponding memory allocation to fail.
**
** The xInit method initializes the memory allocator. For example,
@@ -2684,7 +2696,7 @@ SQLITE_API int sqlite3_db_config(sqlite3*, int op, ...);
** by xInit. The pAppData pointer is used as the only parameter to
** xInit and xShutdown.
**
-** SQLite holds the [SQLITE_MUTEX_STATIC_MASTER] mutex when it invokes
+** SQLite holds the [SQLITE_MUTEX_STATIC_MAIN] mutex when it invokes
** the xInit method, so the xInit method need not be threadsafe. The
** xShutdown method is only called from [sqlite3_shutdown()] so it does
** not need to be threadsafe either. For all other methods, SQLite
@@ -2732,7 +2744,7 @@ struct sqlite3_mem_methods {
** by a single thread. ^If SQLite is compiled with
** the [SQLITE_THREADSAFE | SQLITE_THREADSAFE=0] compile-time option then
** it is not possible to change the [threading mode] from its default
-** value of Single-thread and so [sqlite3_config()] will return
+** value of Single-thread and so [sqlite3_config()] will return
** [SQLITE_ERROR] if called with the SQLITE_CONFIG_SINGLETHREAD
** configuration option.</dd>
**
@@ -2767,7 +2779,7 @@ struct sqlite3_mem_methods {
** SQLITE_CONFIG_SERIALIZED configuration option.</dd>
**
** [[SQLITE_CONFIG_MALLOC]] <dt>SQLITE_CONFIG_MALLOC</dt>
-** <dd> ^(The SQLITE_CONFIG_MALLOC option takes a single argument which is
+** <dd> ^(The SQLITE_CONFIG_MALLOC option takes a single argument which is
** a pointer to an instance of the [sqlite3_mem_methods] structure.
** The argument specifies
** alternative low-level memory allocation routines to be used in place of
@@ -2818,7 +2830,7 @@ struct sqlite3_mem_methods {
** [[SQLITE_CONFIG_PAGECACHE]] <dt>SQLITE_CONFIG_PAGECACHE</dt>
** <dd> ^The SQLITE_CONFIG_PAGECACHE option specifies a memory pool
** that SQLite can use for the database page cache with the default page
-** cache implementation.
+** cache implementation.
** This configuration option is a no-op if an application-defined page
** cache implementation is loaded using the [SQLITE_CONFIG_PCACHE2].
** ^There are three arguments to SQLITE_CONFIG_PAGECACHE: A pointer to
@@ -2846,7 +2858,7 @@ struct sqlite3_mem_methods {
** additional cache line. </dd>
**
** [[SQLITE_CONFIG_HEAP]] <dt>SQLITE_CONFIG_HEAP</dt>
-** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer
+** <dd> ^The SQLITE_CONFIG_HEAP option specifies a static memory buffer
** that SQLite will use for all of its dynamic memory allocation needs
** beyond those provided for by [SQLITE_CONFIG_PAGECACHE].
** ^The SQLITE_CONFIG_HEAP option is only available if SQLite is compiled
@@ -2901,7 +2913,7 @@ struct sqlite3_mem_methods {
** configuration on individual connections.)^ </dd>
**
** [[SQLITE_CONFIG_PCACHE2]] <dt>SQLITE_CONFIG_PCACHE2</dt>
-** <dd> ^(The SQLITE_CONFIG_PCACHE2 option takes a single argument which is
+** <dd> ^(The SQLITE_CONFIG_PCACHE2 option takes a single argument which is
** a pointer to an [sqlite3_pcache_methods2] object. This object specifies
** the interface to a custom page cache implementation.)^
** ^SQLite makes a copy of the [sqlite3_pcache_methods2] object.</dd>
@@ -2915,7 +2927,7 @@ struct sqlite3_mem_methods {
** <dd> The SQLITE_CONFIG_LOG option is used to configure the SQLite
** global [error log].
** (^The SQLITE_CONFIG_LOG option takes two arguments: a pointer to a
-** function with a call signature of void(*)(void*,int,const char*),
+** function with a call signature of void(*)(void*,int,const char*),
** and a pointer to void. ^If the function pointer is not NULL, it is
** invoked by [sqlite3_log()] to process each logging event. ^If the
** function pointer is NULL, the [sqlite3_log()] interface becomes a no-op.
@@ -3024,7 +3036,7 @@ struct sqlite3_mem_methods {
** [[SQLITE_CONFIG_STMTJRNL_SPILL]]
** <dt>SQLITE_CONFIG_STMTJRNL_SPILL
** <dd>^The SQLITE_CONFIG_STMTJRNL_SPILL option takes a single parameter which
-** becomes the [statement journal] spill-to-disk threshold.
+** becomes the [statement journal] spill-to-disk threshold.
** [Statement journals] are held in memory until their size (in bytes)
** exceeds this threshold, at which point they are written to disk.
** Or if the threshold is -1, statement journals are always held
@@ -3046,7 +3058,7 @@ struct sqlite3_mem_methods {
** than the configured sorter-reference size threshold - then a reference
** is stored in each sorted record and the required column values loaded
** from the database as records are returned in sorted order. The default
-** value for this option is to never use this optimization. Specifying a
+** value for this option is to never use this optimization. Specifying a
** negative value for this option restores the default behaviour.
** This option is only available if SQLite is compiled with the
** [SQLITE_ENABLE_SORTER_REFERENCES] compile-time option.
@@ -3074,7 +3086,7 @@ struct sqlite3_mem_methods {
#define SQLITE_CONFIG_MEMSTATUS 9 /* boolean */
#define SQLITE_CONFIG_MUTEX 10 /* sqlite3_mutex_methods* */
#define SQLITE_CONFIG_GETMUTEX 11 /* sqlite3_mutex_methods* */
-/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */
+/* previously SQLITE_CONFIG_CHUNKALLOC 12 which is now unused. */
#define SQLITE_CONFIG_LOOKASIDE 13 /* int int */
#define SQLITE_CONFIG_PCACHE 14 /* no-op */
#define SQLITE_CONFIG_GETPCACHE 15 /* no-op */
@@ -3109,7 +3121,7 @@ struct sqlite3_mem_methods {
** <dl>
** [[SQLITE_DBCONFIG_LOOKASIDE]]
** <dt>SQLITE_DBCONFIG_LOOKASIDE</dt>
-** <dd> ^This option takes three additional arguments that determine the
+** <dd> ^This option takes three additional arguments that determine the
** [lookaside memory allocator] configuration for the [database connection].
** ^The first argument (the third parameter to [sqlite3_db_config()] is a
** pointer to a memory buffer to use for lookaside memory.
@@ -3127,7 +3139,7 @@ struct sqlite3_mem_methods {
** when the "current value" returned by
** [sqlite3_db_status](D,[SQLITE_CONFIG_LOOKASIDE],...) is zero.
** Any attempt to change the lookaside memory configuration when lookaside
-** memory is in use leaves the configuration unchanged and returns
+** memory is in use leaves the configuration unchanged and returns
** [SQLITE_BUSY].)^</dd>
**
** [[SQLITE_DBCONFIG_ENABLE_FKEY]]
@@ -3204,11 +3216,11 @@ struct sqlite3_mem_methods {
** until after the database connection closes.
** </dd>
**
-** [[SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE]]
+** [[SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE]]
** <dt>SQLITE_DBCONFIG_NO_CKPT_ON_CLOSE</dt>
-** <dd> Usually, when a database in wal mode is closed or detached from a
-** database handle, SQLite checks if this will mean that there are now no
-** connections at all to the database. If so, it performs a checkpoint
+** <dd> Usually, when a database in wal mode is closed or detached from a
+** database handle, SQLite checks if this will mean that there are now no
+** connections at all to the database. If so, it performs a checkpoint
** operation before closing the connection. This option may be used to
** override this behaviour. The first parameter passed to this operation
** is an integer - positive to disable checkpoints-on-close, or zero (the
@@ -3227,7 +3239,7 @@ struct sqlite3_mem_methods {
** slower. But the QPSG has the advantage of more predictable behavior. With
** the QPSG active, SQLite will always use the same query plan in the field as
** was used during testing in the lab.
-** The first argument to this setting is an integer which is 0 to disable
+** The first argument to this setting is an integer which is 0 to disable
** the QPSG, positive to enable QPSG, or negative to leave the setting
** unchanged. The second parameter is a pointer to an integer into which
** is written 0 or 1 to indicate whether the QPSG is disabled or enabled
@@ -3235,15 +3247,15 @@ struct sqlite3_mem_methods {
** </dd>
**
** [[SQLITE_DBCONFIG_TRIGGER_EQP]] <dt>SQLITE_DBCONFIG_TRIGGER_EQP</dt>
-** <dd> By default, the output of EXPLAIN QUERY PLAN commands does not
+** <dd> By default, the output of EXPLAIN QUERY PLAN commands does not
** include output for any operations performed by trigger programs. This
** option is used to set or clear (the default) a flag that governs this
** behavior. The first parameter passed to this operation is an integer -
** positive to enable output for trigger programs, or zero to disable it,
** or negative to leave the setting unchanged.
-** The second parameter is a pointer to an integer into which is written
-** 0 or 1 to indicate whether output-for-triggers has been disabled - 0 if
-** it is not disabled, 1 if it is.
+** The second parameter is a pointer to an integer into which is written
+** 0 or 1 to indicate whether output-for-triggers has been disabled - 0 if
+** it is not disabled, 1 if it is.
** </dd>
**
** [[SQLITE_DBCONFIG_RESET_DATABASE]] <dt>SQLITE_DBCONFIG_RESET_DATABASE</dt>
@@ -3257,7 +3269,7 @@ struct sqlite3_mem_methods {
** database, or calling sqlite3_table_column_metadata(), ignoring any
** errors. This step is only necessary if the application desires to keep
** the database in WAL mode after the reset if it was in WAL mode before
-** the reset.
+** the reset.
** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 1, 0);
** <li> [sqlite3_exec](db, "[VACUUM]", 0, 0, 0);
** <li> sqlite3_db_config(db, SQLITE_DBCONFIG_RESET_DATABASE, 0, 0);
@@ -3269,7 +3281,7 @@ struct sqlite3_mem_methods {
** [[SQLITE_DBCONFIG_DEFENSIVE]] <dt>SQLITE_DBCONFIG_DEFENSIVE</dt>
** <dd>The SQLITE_DBCONFIG_DEFENSIVE option activates or deactivates the
** "defensive" flag for a database connection. When the defensive
-** flag is enabled, language features that allow ordinary SQL to
+** flag is enabled, language features that allow ordinary SQL to
** deliberately corrupt the database file are disabled. The disabled
** features include but are not limited to the following:
** <ul>
@@ -3284,7 +3296,7 @@ struct sqlite3_mem_methods {
** <dd>The SQLITE_DBCONFIG_WRITABLE_SCHEMA option activates or deactivates the
** "writable_schema" flag. This has the same effect and is logically equivalent
** to setting [PRAGMA writable_schema=ON] or [PRAGMA writable_schema=OFF].
-** The first argument to this setting is an integer which is 0 to disable
+** The first argument to this setting is an integer which is 0 to disable
** the writable_schema, positive to enable writable_schema, or negative to
** leave the setting unchanged. The second parameter is a pointer to an
** integer into which is written 0 or 1 to indicate whether the writable_schema
@@ -3322,14 +3334,13 @@ struct sqlite3_mem_methods {
** [[SQLITE_DBCONFIG_TRUSTED_SCHEMA]]
** <dt>SQLITE_DBCONFIG_TRUSTED_SCHEMA</td>
** <dd>The SQLITE_DBCONFIG_TRUSTED_SCHEMA option tells SQLite to
-** assume that database schemas (the contents of the [sqlite_master] tables)
-** are untainted by malicious content.
+** assume that database schemas are untainted by malicious content.
** When the SQLITE_DBCONFIG_TRUSTED_SCHEMA option is disabled, SQLite
** takes additional defensive steps to protect the application from harm
** including:
** <ul>
** <li> Prohibit the use of SQL functions inside triggers, views,
-** CHECK constraints, DEFAULT clauses, expression indexes,
+** CHECK constraints, DEFAULT clauses, expression indexes,
** partial indexes, or generated columns
** unless those functions are tagged with [SQLITE_INNOCUOUS].
** <li> Prohibit the use of virtual tables inside of triggers or views
@@ -3350,7 +3361,7 @@ struct sqlite3_mem_methods {
** any SQLite version back to 3.0.0 ([dateof:3.0.0]). Without this setting,
** newly created databases are generally not understandable by SQLite versions
** prior to 3.3.0 ([dateof:3.3.0]). As these words are written, there
-** is now scarcely any need to generated database files that are compatible
+** is now scarcely any need to generated database files that are compatible
** all the way back to version 3.0.0, and so this setting is of little
** practical use, but is provided so that SQLite can continue to claim the
** ability to generate new database files that are compatible with version
@@ -3408,8 +3419,8 @@ SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
** ^The sqlite3_last_insert_rowid(D) interface usually returns the [rowid] of
** the most recent successful [INSERT] into a rowid table or [virtual table]
** on database connection D. ^Inserts into [WITHOUT ROWID] tables are not
-** recorded. ^If no successful [INSERT]s into rowid tables have ever occurred
-** on the database connection D, then sqlite3_last_insert_rowid(D) returns
+** recorded. ^If no successful [INSERT]s into rowid tables have ever occurred
+** on the database connection D, then sqlite3_last_insert_rowid(D) returns
** zero.
**
** As well as being set automatically as rows are inserted into database
@@ -3419,15 +3430,15 @@ SQLITE_API int sqlite3_extended_result_codes(sqlite3*, int onoff);
** Some virtual table implementations may INSERT rows into rowid tables as
** part of committing a transaction (e.g. to flush data accumulated in memory
** to disk). In this case subsequent calls to this function return the rowid
-** associated with these internal INSERT operations, which leads to
+** associated with these internal INSERT operations, which leads to
** unintuitive results. Virtual table implementations that do write to rowid
-** tables in this way can avoid this problem by restoring the original
-** rowid value using [sqlite3_set_last_insert_rowid()] before returning
+** tables in this way can avoid this problem by restoring the original
+** rowid value using [sqlite3_set_last_insert_rowid()] before returning
** control to the user.
**
-** ^(If an [INSERT] occurs within a trigger then this routine will
-** return the [rowid] of the inserted row as long as the trigger is
-** running. Once the trigger program ends, the value returned
+** ^(If an [INSERT] occurs within a trigger then this routine will
+** return the [rowid] of the inserted row as long as the trigger is
+** running. Once the trigger program ends, the value returned
** by this routine reverts to what it was before the trigger was fired.)^
**
** ^An [INSERT] that fails due to a constraint violation is not a
@@ -3460,7 +3471,7 @@ SQLITE_API sqlite3_int64 sqlite3_last_insert_rowid(sqlite3*);
** METHOD: sqlite3
**
** The sqlite3_set_last_insert_rowid(D, R) method allows the application to
-** set the value returned by calling sqlite3_last_insert_rowid(D) to R
+** set the value returned by calling sqlite3_last_insert_rowid(D) to R
** without inserting a row into the database.
*/
SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3*,sqlite3_int64);
@@ -3476,37 +3487,37 @@ SQLITE_API void sqlite3_set_last_insert_rowid(sqlite3*,sqlite3_int64);
** returned by this function.
**
** ^Only changes made directly by the INSERT, UPDATE or DELETE statement are
-** considered - auxiliary changes caused by [CREATE TRIGGER | triggers],
+** considered - auxiliary changes caused by [CREATE TRIGGER | triggers],
** [foreign key actions] or [REPLACE] constraint resolution are not counted.
-**
-** Changes to a view that are intercepted by
-** [INSTEAD OF trigger | INSTEAD OF triggers] are not counted. ^The value
-** returned by sqlite3_changes() immediately after an INSERT, UPDATE or
-** DELETE statement run on a view is always zero. Only changes made to real
+**
+** Changes to a view that are intercepted by
+** [INSTEAD OF trigger | INSTEAD OF triggers] are not counted. ^The value
+** returned by sqlite3_changes() immediately after an INSERT, UPDATE or
+** DELETE statement run on a view is always zero. Only changes made to real
** tables are counted.
**
** Things are more complicated if the sqlite3_changes() function is
** executed while a trigger program is running. This may happen if the
** program uses the [changes() SQL function], or if some other callback
** function invokes sqlite3_changes() directly. Essentially:
-**
+**
** <ul>
** <li> ^(Before entering a trigger program the value returned by
-** sqlite3_changes() function is saved. After the trigger program
+** sqlite3_changes() function is saved. After the trigger program
** has finished, the original value is restored.)^
-**
-** <li> ^(Within a trigger program each INSERT, UPDATE and DELETE
-** statement sets the value returned by sqlite3_changes()
-** upon completion as normal. Of course, this value will not include
-** any changes performed by sub-triggers, as the sqlite3_changes()
+**
+** <li> ^(Within a trigger program each INSERT, UPDATE and DELETE
+** statement sets the value returned by sqlite3_changes()
+** upon completion as normal. Of course, this value will not include
+** any changes performed by sub-triggers, as the sqlite3_changes()
** value will be saved and restored after each sub-trigger has run.)^
** </ul>
-**
+**
** ^This means that if the changes() SQL function (or similar) is used
-** by the first INSERT, UPDATE or DELETE statement within a trigger, it
+** by the first INSERT, UPDATE or DELETE statement within a trigger, it
** returns the value as set when the calling statement began executing.
-** ^If it is used by the second or subsequent such statement within a trigger
-** program, the value returned reflects the number of rows modified by the
+** ^If it is used by the second or subsequent such statement within a trigger
+** program, the value returned reflects the number of rows modified by the
** previous INSERT, UPDATE or DELETE statement within the same trigger.
**
** If a separate thread makes changes on the same database connection
@@ -3532,10 +3543,10 @@ SQLITE_API int sqlite3_changes(sqlite3*);
** since the database connection was opened, including those executed as
** part of trigger programs. ^Executing any other type of SQL statement
** does not affect the value returned by sqlite3_total_changes().
-**
+**
** ^Changes made as part of [foreign key actions] are included in the
** count, but those made as part of REPLACE constraint resolution are
-** not. ^Changes to a view that are intercepted by INSTEAD OF triggers
+** not. ^Changes to a view that are intercepted by INSTEAD OF triggers
** are not counted.
**
** The [sqlite3_total_changes(D)] interface only reports the number
@@ -3544,7 +3555,7 @@ SQLITE_API int sqlite3_changes(sqlite3*);
** To detect changes against a database file from other database
** connections use the [PRAGMA data_version] command or the
** [SQLITE_FCNTL_DATA_VERSION] [file control].
-**
+**
** If a separate thread makes changes on the same database connection
** while [sqlite3_total_changes()] is running then the value
** returned is unpredictable and not meaningful.
@@ -3586,7 +3597,7 @@ SQLITE_API int sqlite3_total_changes(sqlite3*);
**
** ^The sqlite3_interrupt(D) call is in effect until all currently running
** SQL statements on [database connection] D complete. ^Any new SQL statements
-** that are started after the sqlite3_interrupt() call and before the
+** that are started after the sqlite3_interrupt() call and before the
** running statement count reaches zero are interrupted as if they had been
** running prior to the sqlite3_interrupt() call. ^New SQL statements
** that are started after the running statement count reaches zero are
@@ -3618,7 +3629,7 @@ SQLITE_API void sqlite3_interrupt(sqlite3*);
** ^These routines do not parse the SQL statements thus
** will not detect syntactically incorrect SQL.
**
-** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
+** ^(If SQLite has not been initialized using [sqlite3_initialize()] prior
** to invoking sqlite3_complete16() then sqlite3_initialize() is invoked
** automatically by sqlite3_complete16(). If that initialization fails,
** then the return value from sqlite3_complete16() will be non-zero
@@ -3663,7 +3674,7 @@ SQLITE_API int sqlite3_complete16(const void *sql);
** The presence of a busy handler does not guarantee that it will be invoked
** when there is lock contention. ^If SQLite determines that invoking the busy
** handler could result in a deadlock, it will go ahead and return [SQLITE_BUSY]
-** to the application instead of invoking the
+** to the application instead of invoking the
** busy handler.
** Consider a scenario where one process is holding a read lock that
** it is trying to promote to a reserved lock and
@@ -3688,7 +3699,7 @@ SQLITE_API int sqlite3_complete16(const void *sql);
** database connection that invoked the busy handler. In other words,
** the busy handler is not reentrant. Any such actions
** result in undefined behavior.
-**
+**
** A busy handler must not close the database connection
** or [prepared statement] that invoked the busy handler.
*/
@@ -3806,7 +3817,7 @@ SQLITE_API void sqlite3_free_table(char **result);
** These routines are work-alikes of the "printf()" family of functions
** from the standard C library.
** These routines understand most of the common formatting options from
-** the standard library printf()
+** the standard library printf()
** plus some additional non-standard formats ([%q], [%Q], [%w], and [%z]).
** See the [built-in printf()] documentation for details.
**
@@ -4002,7 +4013,7 @@ SQLITE_API void sqlite3_randomness(int N, void *P);
** requested is ok. ^When the callback returns [SQLITE_DENY], the
** [sqlite3_prepare_v2()] or equivalent call that triggered the
** authorizer will fail with an error message explaining that
-** access is denied.
+** access is denied.
**
** ^The first parameter to the authorizer callback is a copy of the third
** parameter to the sqlite3_set_authorizer() interface. ^The second parameter
@@ -4055,7 +4066,7 @@ SQLITE_API void sqlite3_randomness(int N, void *P);
** database connections for the meaning of "modify" in this paragraph.
**
** ^When [sqlite3_prepare_v2()] is used to prepare a statement, the
-** statement might be re-prepared during [sqlite3_step()] due to a
+** statement might be re-prepared during [sqlite3_step()] due to a
** schema change. Hence, the application should ensure that the
** correct authorizer callback remains in place during the [sqlite3_step()].
**
@@ -4203,7 +4214,7 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
** execution of the prepared statement, such as at the start of each
** trigger subprogram. ^The P argument is a pointer to the
** [prepared statement]. ^The X argument is a pointer to a string which
-** is the unexpanded SQL text of the prepared statement or an SQL comment
+** is the unexpanded SQL text of the prepared statement or an SQL comment
** that indicates the invocation of a trigger. ^The callback can compute
** the same text that would have been returned by the legacy [sqlite3_trace()]
** interface by using the X argument when X begins with "--" and invoking
@@ -4219,7 +4230,7 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
**
** [[SQLITE_TRACE_ROW]] <dt>SQLITE_TRACE_ROW</dt>
** <dd>^An SQLITE_TRACE_ROW callback is invoked whenever a prepared
-** statement generates a single row of result.
+** statement generates a single row of result.
** ^The P argument is a pointer to the [prepared statement] and the
** X argument is unused.
**
@@ -4246,10 +4257,10 @@ SQLITE_API SQLITE_DEPRECATED void *sqlite3_profile(sqlite3*,
** M argument should be the bitwise OR-ed combination of
** zero or more [SQLITE_TRACE] constants.
**
-** ^Each call to either sqlite3_trace() or sqlite3_trace_v2() overrides
+** ^Each call to either sqlite3_trace() or sqlite3_trace_v2() overrides
** (cancels) any prior calls to sqlite3_trace() or sqlite3_trace_v2().
**
-** ^The X callback is invoked whenever any of the events identified by
+** ^The X callback is invoked whenever any of the events identified by
** mask M occur. ^The integer return value from the callback is currently
** ignored, though this may change in future releases. Callback
** implementations should return zero to ensure future compatibility.
@@ -4281,8 +4292,8 @@ SQLITE_API int sqlite3_trace_v2(
** database connection D. An example use for this
** interface is to keep a GUI updated during a large query.
**
-** ^The parameter P is passed through as the only parameter to the
-** callback function X. ^The parameter N is the approximate number of
+** ^The parameter P is passed through as the only parameter to the
+** callback function X. ^The parameter N is the approximate number of
** [virtual machine instructions] that are evaluated between successive
** invocations of the callback X. ^If N is less than one then the progress
** handler is disabled.
@@ -4309,7 +4320,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** CAPI3REF: Opening A New Database Connection
** CONSTRUCTOR: sqlite3
**
-** ^These routines open an SQLite database file as specified by the
+** ^These routines open an SQLite database file as specified by the
** filename argument. ^The filename argument is interpreted as UTF-8 for
** sqlite3_open() and sqlite3_open_v2() and as UTF-16 in the native byte
** order for sqlite3_open16(). ^(A [database connection] handle is usually
@@ -4428,17 +4439,17 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** information.
**
** URI filenames are parsed according to RFC 3986. ^If the URI contains an
-** authority, then it must be either an empty string or the string
-** "localhost". ^If the authority is not an empty string or "localhost", an
-** error is returned to the caller. ^The fragment component of a URI, if
+** authority, then it must be either an empty string or the string
+** "localhost". ^If the authority is not an empty string or "localhost", an
+** error is returned to the caller. ^The fragment component of a URI, if
** present, is ignored.
**
** ^SQLite uses the path component of the URI as the name of the disk file
-** which contains the database. ^If the path begins with a '/' character,
-** then it is interpreted as an absolute path. ^If the path does not begin
+** which contains the database. ^If the path begins with a '/' character,
+** then it is interpreted as an absolute path. ^If the path does not begin
** with a '/' (meaning that the authority section is omitted from the URI)
-** then the path is interpreted as a relative path.
-** ^(On windows, the first component of an absolute path
+** then the path is interpreted as a relative path.
+** ^(On windows, the first component of an absolute path
** is a drive specification (e.g. "C:").)^
**
** [[core URI query parameters]]
@@ -4458,13 +4469,13 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
**
** <li> <b>mode</b>: ^(The mode parameter may be set to either "ro", "rw",
** "rwc", or "memory". Attempting to set it to any other value is
-** an error)^.
-** ^If "ro" is specified, then the database is opened for read-only
-** access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the
-** third argument to sqlite3_open_v2(). ^If the mode option is set to
-** "rw", then the database is opened for read-write (but not create)
-** access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had
-** been set. ^Value "rwc" is equivalent to setting both
+** an error)^.
+** ^If "ro" is specified, then the database is opened for read-only
+** access, just as if the [SQLITE_OPEN_READONLY] flag had been set in the
+** third argument to sqlite3_open_v2(). ^If the mode option is set to
+** "rw", then the database is opened for read-write (but not create)
+** access, as if SQLITE_OPEN_READWRITE (but not SQLITE_OPEN_CREATE) had
+** been set. ^Value "rwc" is equivalent to setting both
** SQLITE_OPEN_READWRITE and SQLITE_OPEN_CREATE. ^If the mode option is
** set to "memory" then a pure [in-memory database] that never reads
** or writes from disk is used. ^It is an error to specify a value for
@@ -4474,7 +4485,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** <li> <b>cache</b>: ^The cache parameter may be set to either "shared" or
** "private". ^Setting it to "shared" is equivalent to setting the
** SQLITE_OPEN_SHAREDCACHE bit in the flags argument passed to
-** sqlite3_open_v2(). ^Setting the cache parameter to "private" is
+** sqlite3_open_v2(). ^Setting the cache parameter to "private" is
** equivalent to setting the SQLITE_OPEN_PRIVATECACHE bit.
** ^If sqlite3_open_v2() is used and the "cache" parameter is present in
** a URI filename, its value overrides any behavior requested by setting
@@ -4500,7 +4511,7 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
** property on a database file that does in fact change can result
** in incorrect query results and/or [SQLITE_CORRUPT] errors.
** See also: [SQLITE_IOCAP_IMMUTABLE].
-**
+**
** </ul>
**
** ^Specifying an unknown parameter in the query component of a URI is not an
@@ -4512,36 +4523,36 @@ SQLITE_API void sqlite3_progress_handler(sqlite3*, int, int(*)(void*), void*);
**
** <table border="1" align=center cellpadding=5>
** <tr><th> URI filenames <th> Results
-** <tr><td> file:data.db <td>
+** <tr><td> file:data.db <td>
** Open the file "data.db" in the current directory.
** <tr><td> file:/home/fred/data.db<br>
-** file:///home/fred/data.db <br>
-** file://localhost/home/fred/data.db <br> <td>
+** file:///home/fred/data.db <br>
+** file://localhost/home/fred/data.db <br> <td>
** Open the database file "/home/fred/data.db".
-** <tr><td> file://darkstar/home/fred/data.db <td>
+** <tr><td> file://darkstar/home/fred/data.db <td>
** An error. "darkstar" is not a recognized authority.
-** <tr><td style="white-space:nowrap">
+** <tr><td style="white-space:nowrap">
** file:///C:/Documents%20and%20Settings/fred/Desktop/data.db
** <td> Windows only: Open the file "data.db" on fred's desktop on drive
-** C:. Note that the %20 escaping in this example is not strictly
+** C:. Note that the %20 escaping in this example is not strictly
** necessary - space characters can be used literally
** in URI filenames.
-** <tr><td> file:data.db?mode=ro&cache=private <td>
+** <tr><td> file:data.db?mode=ro&cache=private <td>
** Open file "data.db" in the current directory for read-only access.
** Regardless of whether or not shared-cache mode is enabled by
** default, use a private cache.
** <tr><td> file:/home/fred/data.db?vfs=unix-dotfile <td>
** Open file "/home/fred/data.db". Use the special VFS "unix-dotfile"
** that uses dot-files in place of posix advisory locking.
-** <tr><td> file:data.db?mode=readonly <td>
+** <tr><td> file:data.db?mode=readonly <td>
** An error. "readonly" is not a valid option for the "mode" parameter.
** </table>
**
** ^URI hexadecimal escape sequences (%HH) are supported within the path and
** query components of a URI. A hexadecimal escape sequence consists of a
-** percent sign - "%" - followed by exactly two hexadecimal digits
+** percent sign - "%" - followed by exactly two hexadecimal digits
** specifying an octet value. ^Before the path or query components of a
-** URI filename are interpreted, they are encoded using UTF-8 and all
+** URI filename are interpreted, they are encoded using UTF-8 and all
** hexadecimal escape sequences replaced by a single byte containing the
** corresponding octet. If this process generates an invalid UTF-8 encoding,
** the results are undefined.
@@ -4577,7 +4588,7 @@ SQLITE_API int sqlite3_open_v2(
** CAPI3REF: Obtain Values For URI Parameters
**
** These are utility routines, useful to [VFS|custom VFS implementations],
-** that check if a database file was a URI that contained a specific query
+** that check if a database file was a URI that contained a specific query
** parameter, and if so obtains the value of that query parameter.
**
** The first parameter to these interfaces (hereafter referred to
@@ -4595,7 +4606,7 @@ SQLITE_API int sqlite3_open_v2(
** If F is a suitable filename (as described in the previous paragraph)
** and if P is the name of the query parameter, then
** sqlite3_uri_parameter(F,P) returns the value of the P
-** parameter if it exists or a NULL pointer if P does not appear as a
+** parameter if it exists or a NULL pointer if P does not appear as a
** query parameter on F. If P is a query parameter of F and it
** has no explicit value, then sqlite3_uri_parameter(F,P) returns
** a pointer to an empty string.
@@ -4604,7 +4615,7 @@ SQLITE_API int sqlite3_open_v2(
** parameter and returns true (1) or false (0) according to the value
** of P. The sqlite3_uri_boolean(F,P,B) routine returns true (1) if the
** value of query parameter P is one of "yes", "true", or "on" in any
-** case or if the value begins with a non-zero number. The
+** case or if the value begins with a non-zero number. The
** sqlite3_uri_boolean(F,P,B) routines returns false (0) if the value of
** query parameter P is one of "no", "false", or "off" in any case or
** if the value begins with a numeric zero. If P is not a query
@@ -4622,7 +4633,7 @@ SQLITE_API int sqlite3_open_v2(
** parameters minus 1. The N value is zero-based so N should be 0 to obtain
** the name of the first query parameter, 1 for the second parameter, and
** so forth.
-**
+**
** If F is a NULL pointer, then sqlite3_uri_parameter(F,P) returns NULL and
** sqlite3_uri_boolean(F,P,B) returns B. If F is not a NULL pointer and
** is not a database file pathname pointer that the SQLite core passed
@@ -4679,14 +4690,14 @@ SQLITE_API const char *sqlite3_filename_wal(const char*);
** CAPI3REF: Database File Corresponding To A Journal
**
** ^If X is the name of a rollback or WAL-mode journal file that is
-** passed into the xOpen method of [sqlite3_vfs], then
+** passed into the xOpen method of [sqlite3_vfs], then
** sqlite3_database_file_object(X) returns a pointer to the [sqlite3_file]
** object that represents the main database file.
**
** This routine is intended for use in custom [VFS] implementations
** only. It is not a general-purpose interface.
** The argument sqlite3_file_object(X) must be a filename pointer that
-** has been passed into [sqlite3_vfs].xOpen method where the
+** has been passed into [sqlite3_vfs].xOpen method where the
** flags parameter to xOpen contains one of the bits
** [SQLITE_OPEN_MAIN_JOURNAL] or [SQLITE_OPEN_WAL]. Any other use
** of this routine results in undefined and probably undesirable
@@ -4709,7 +4720,7 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
** <li> [sqlite3_uri_parameter()],
** <li> [sqlite3_uri_boolean()],
** <li> [sqlite3_uri_int64()],
-** <li> [sqlite3_uri_key()],
+** <li> [sqlite3_uri_key()],
** <li> [sqlite3_filename_database()],
** <li> [sqlite3_filename_journal()], or
** <li> [sqlite3_filename_wal()].
@@ -4733,7 +4744,7 @@ SQLITE_API sqlite3_file *sqlite3_database_file_object(const char*);
** If the Y parameter to sqlite3_free_filename(Y) is anything other
** than a NULL pointer or a pointer previously acquired from
** sqlite3_create_filename(), then bad things such as heap
-** corruption or segfaults may occur. The value Y should be
+** corruption or segfaults may occur. The value Y should be
** used again after sqlite3_free_filename(Y) has been called. This means
** that if the [sqlite3_vfs.xOpen()] method of a VFS has been called using Y,
** then the corresponding [sqlite3_module.xClose() method should also be
@@ -4752,12 +4763,12 @@ SQLITE_API void sqlite3_free_filename(char*);
** CAPI3REF: Error Codes And Messages
** METHOD: sqlite3
**
-** ^If the most recent sqlite3_* API call associated with
+** ^If the most recent sqlite3_* API call associated with
** [database connection] D failed, then the sqlite3_errcode(D) interface
** returns the numeric [result code] or [extended result code] for that
** API call.
** ^The sqlite3_extended_errcode()
-** interface is the same except that it always returns the
+** interface is the same except that it always returns the
** [extended result code] even when extended result codes are
** disabled.
**
@@ -4814,7 +4825,7 @@ SQLITE_API const char *sqlite3_errstr(int);
** has been compiled into binary form and is ready to be evaluated.
**
** Think of each SQL statement as a separate computer program. The
-** original SQL text is source code. A prepared statement object
+** original SQL text is source code. A prepared statement object
** is the compiled object code. All SQL must be converted into a
** prepared statement before it can be run.
**
@@ -4844,7 +4855,7 @@ typedef struct sqlite3_stmt sqlite3_stmt;
** new limit for that construct.)^
**
** ^If the new limit is a negative number, the limit is unchanged.
-** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a
+** ^(For each limit category SQLITE_LIMIT_<i>NAME</i> there is a
** [limits | hard upper bound]
** set at compile-time by a C preprocessor macro called
** [limits | SQLITE_MAX_<i>NAME</i>].
@@ -4852,7 +4863,7 @@ typedef struct sqlite3_stmt sqlite3_stmt;
** ^Attempts to increase a limit above its hard upper bound are
** silently truncated to the hard upper bound.
**
-** ^Regardless of whether or not the limit was changed, the
+** ^Regardless of whether or not the limit was changed, the
** [sqlite3_limit()] interface returns the prior value of the limit.
** ^Hence, to find the current value of a limit without changing it,
** simply invoke this interface with the third parameter set to -1.
@@ -4957,7 +4968,7 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
** <dd>The SQLITE_PREPARE_PERSISTENT flag is a hint to the query planner
** that the prepared statement will be retained for a long time and
** probably reused many times.)^ ^Without this flag, [sqlite3_prepare_v3()]
-** and [sqlite3_prepare16_v3()] assume that the prepared statement will
+** and [sqlite3_prepare16_v3()] assume that the prepared statement will
** be used just once or at most a few times and then destroyed using
** [sqlite3_finalize()] relatively soon. The current implementation acts
** on this hint by avoiding the use of [lookaside memory] so as not to
@@ -5064,12 +5075,12 @@ SQLITE_API int sqlite3_limit(sqlite3*, int id, int newVal);
** </li>
**
** <li>
-** ^If the specific value bound to a [parameter | host parameter] in the
+** ^If the specific value bound to a [parameter | host parameter] in the
** WHERE clause might influence the choice of query plan for a statement,
-** then the statement will be automatically recompiled, as if there had been
+** then the statement will be automatically recompiled, as if there had been
** a schema change, on the first [sqlite3_step()] call following any change
-** to the [sqlite3_bind_text | bindings] of that [parameter].
-** ^The specific value of a WHERE-clause [parameter] might influence the
+** to the [sqlite3_bind_text | bindings] of that [parameter].
+** ^The specific value of a WHERE-clause [parameter] might influence the
** choice of query plan if the parameter is the left-hand side of a [LIKE]
** or [GLOB] operator or if the parameter is compared to an indexed column
** and the [SQLITE_ENABLE_STAT4] compile-time option is enabled.
@@ -5178,8 +5189,8 @@ SQLITE_API const char *sqlite3_normalized_sql(sqlite3_stmt *pStmt);
** the content of the database file.
**
** Note that [application-defined SQL functions] or
-** [virtual tables] might change the database indirectly as a side effect.
-** ^(For example, if an application defines a function "eval()" that
+** [virtual tables] might change the database indirectly as a side effect.
+** ^(For example, if an application defines a function "eval()" that
** calls [sqlite3_exec()], then the following SQL statement would
** change the database file through side-effects:
**
@@ -5193,10 +5204,10 @@ SQLITE_API const char *sqlite3_normalized_sql(sqlite3_stmt *pStmt);
** ^Transaction control statements such as [BEGIN], [COMMIT], [ROLLBACK],
** [SAVEPOINT], and [RELEASE] cause sqlite3_stmt_readonly() to return true,
** since the statements themselves do not actually modify the database but
-** rather they control the timing of when other statements modify the
+** rather they control the timing of when other statements modify the
** database. ^The [ATTACH] and [DETACH] statements also cause
** sqlite3_stmt_readonly() to return true since, while those statements
-** change the configuration of a database connection, they do not make
+** change the configuration of a database connection, they do not make
** changes to the content of the database files on disk.
** ^The sqlite3_stmt_readonly() interface returns true for [BEGIN] since
** [BEGIN] merely sets internal flags, but the [BEGIN|BEGIN IMMEDIATE] and
@@ -5222,18 +5233,18 @@ SQLITE_API int sqlite3_stmt_isexplain(sqlite3_stmt *pStmt);
** METHOD: sqlite3_stmt
**
** ^The sqlite3_stmt_busy(S) interface returns true (non-zero) if the
-** [prepared statement] S has been stepped at least once using
+** [prepared statement] S has been stepped at least once using
** [sqlite3_step(S)] but has neither run to completion (returned
** [SQLITE_DONE] from [sqlite3_step(S)]) nor
** been reset using [sqlite3_reset(S)]. ^The sqlite3_stmt_busy(S)
-** interface returns false if S is a NULL pointer. If S is not a
+** interface returns false if S is a NULL pointer. If S is not a
** NULL pointer and is not a pointer to a valid [prepared statement]
** object, then the behavior is undefined and probably undesirable.
**
** This interface can be used in combination [sqlite3_next_stmt()]
-** to locate all prepared statements associated with a database
+** to locate all prepared statements associated with a database
** connection that are in need of being reset. This can be used,
-** for example, in diagnostic routines to search for prepared
+** for example, in diagnostic routines to search for prepared
** statements that are holding a transaction open.
*/
SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
@@ -5252,7 +5263,7 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
** will accept either a protected or an unprotected sqlite3_value.
** Every interface that accepts sqlite3_value arguments specifies
** whether or not it requires a protected sqlite3_value. The
-** [sqlite3_value_dup()] interface can be used to construct a new
+** [sqlite3_value_dup()] interface can be used to construct a new
** protected sqlite3_value from an unprotected sqlite3_value.
**
** The terms "protected" and "unprotected" refer to whether or not
@@ -5260,7 +5271,7 @@ SQLITE_API int sqlite3_stmt_busy(sqlite3_stmt*);
** sqlite3_value object but no mutex is held for an unprotected
** sqlite3_value object. If SQLite is compiled to be single-threaded
** (with [SQLITE_THREADSAFE=0] and with [sqlite3_threadsafe()] returning 0)
-** or if SQLite is run in one of reduced mutex modes
+** or if SQLite is run in one of reduced mutex modes
** [SQLITE_CONFIG_SINGLETHREAD] or [SQLITE_CONFIG_MULTITHREAD]
** then there is no distinction between protected and unprotected
** sqlite3_value objects and they can be used interchangeably. However,
@@ -5349,7 +5360,7 @@ typedef struct sqlite3_context sqlite3_context;
** found in first character, which is removed, or in the absence of a BOM
** the byte order is the native byte order of the host
** machine for sqlite3_bind_text16() or the byte order specified in
-** the 6th parameter for sqlite3_bind_text64().)^
+** the 6th parameter for sqlite3_bind_text64().)^
** ^If UTF16 input text contains invalid unicode
** characters, then SQLite might change those invalid characters
** into the unicode replacement character: U+FFFD.
@@ -5366,7 +5377,7 @@ typedef struct sqlite3_context sqlite3_context;
** or sqlite3_bind_text16() or sqlite3_bind_text64() then
** that parameter must be the byte offset
** where the NUL terminator would occur assuming the string were NUL
-** terminated. If any NUL characters occurs at byte offsets less than
+** terminated. If any NUL characters occurs at byte offsets less than
** the value of the fourth parameter then the resulting string value will
** contain embedded NULs. The result of expressions involving strings
** with embedded NULs is undefined.
@@ -5528,7 +5539,7 @@ SQLITE_API int sqlite3_clear_bindings(sqlite3_stmt*);
** METHOD: sqlite3_stmt
**
** ^Return the number of columns in the result set returned by the
-** [prepared statement]. ^If this routine returns 0, that means the
+** [prepared statement]. ^If this routine returns 0, that means the
** [prepared statement] returns no data (for example an [UPDATE]).
** ^However, just because this routine returns a positive number does not
** mean that one or more rows of data will be returned. ^A SELECT statement
@@ -5710,7 +5721,7 @@ SQLITE_API const void *sqlite3_column_decltype16(sqlite3_stmt*,int);
** For all versions of SQLite up to and including 3.6.23.1, a call to
** [sqlite3_reset()] was required after sqlite3_step() returned anything
** other than [SQLITE_ROW] before any subsequent invocation of
-** sqlite3_step(). Failure to reset the prepared statement using
+** sqlite3_step(). Failure to reset the prepared statement using
** [sqlite3_reset()] would result in an [SQLITE_MISUSE] return from
** sqlite3_step(). But after [version 3.6.23.1] ([dateof:3.6.23.1],
** sqlite3_step() began
@@ -5801,7 +5812,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
** <tr><td><b>sqlite3_column_int64</b><td>&rarr;<td>64-bit INTEGER result
** <tr><td><b>sqlite3_column_text</b><td>&rarr;<td>UTF-8 TEXT result
** <tr><td><b>sqlite3_column_text16</b><td>&rarr;<td>UTF-16 TEXT result
-** <tr><td><b>sqlite3_column_value</b><td>&rarr;<td>The result as an
+** <tr><td><b>sqlite3_column_value</b><td>&rarr;<td>The result as an
** [sqlite3_value|unprotected sqlite3_value] object.
** <tr><td>&nbsp;<td>&nbsp;<td>&nbsp;
** <tr><td><b>sqlite3_column_bytes</b><td>&rarr;<td>Size of a BLOB
@@ -5849,7 +5860,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
** The return value of sqlite3_column_type() can be used to decide which
** of the first six interface should be used to extract the column value.
** The value returned by sqlite3_column_type() is only meaningful if no
-** automatic type conversions have occurred for the value in question.
+** automatic type conversions have occurred for the value in question.
** After a type conversion, the result of calling sqlite3_column_type()
** is undefined, though harmless. Future
** versions of SQLite may change the behavior of sqlite3_column_type()
@@ -5877,7 +5888,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
** the number of bytes in that string.
** ^If the result is NULL, then sqlite3_column_bytes16() returns zero.
**
-** ^The values returned by [sqlite3_column_bytes()] and
+** ^The values returned by [sqlite3_column_bytes()] and
** [sqlite3_column_bytes16()] do not include the zero terminators at the end
** of the string. ^For clarity: the values returned by
** [sqlite3_column_bytes()] and [sqlite3_column_bytes16()] are the number of
@@ -5896,7 +5907,7 @@ SQLITE_API int sqlite3_data_count(sqlite3_stmt *pStmt);
** to routines like [sqlite3_value_int()], [sqlite3_value_text()],
** or [sqlite3_value_bytes()], the behavior is not threadsafe.
** Hence, the sqlite3_column_value() interface
-** is normally only useful within the implementation of
+** is normally only useful within the implementation of
** [application-defined SQL functions] or [virtual tables], not within
** top-level application code.
**
@@ -6071,8 +6082,8 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
** ^These functions (collectively known as "function creation routines")
** are used to add SQL functions or aggregates or to redefine the behavior
** of existing SQL functions or aggregates. The only differences between
-** the three "sqlite3_create_function*" routines are the text encoding
-** expected for the second parameter (the name of the function being
+** the three "sqlite3_create_function*" routines are the text encoding
+** expected for the second parameter (the name of the function being
** created) and the presence or absence of a destructor callback for
** the application data pointer. Function sqlite3_create_window_function()
** is similar, but allows the user to supply the extra callback functions
@@ -6086,7 +6097,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
** ^The second parameter is the name of the SQL function to be created or
** redefined. ^The length of the name is limited to 255 bytes in a UTF-8
** representation, exclusive of the zero-terminator. ^Note that the name
-** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes.
+** length limit is in UTF-8 bytes, not characters nor UTF-16 bytes.
** ^Any attempt to create a function with a longer name
** will result in [SQLITE_MISUSE] being returned.
**
@@ -6101,7 +6112,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
** ^The fourth parameter, eTextRep, specifies what
** [SQLITE_UTF8 | text encoding] this SQL function prefers for
** its parameters. The application should set this parameter to
-** [SQLITE_UTF16LE] if the function implementation invokes
+** [SQLITE_UTF16LE] if the function implementation invokes
** [sqlite3_value_text16le()] on an input, or [SQLITE_UTF16BE] if the
** implementation invokes [sqlite3_value_text16be()] on an input, or
** [SQLITE_UTF16] if [sqlite3_value_text16()] is used, or [SQLITE_UTF8]
@@ -6128,7 +6139,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
** For best security, the [SQLITE_DIRECTONLY] flag is recommended for
** all application-defined SQL functions that do not need to be
** used inside of triggers, view, CHECK constraints, or other elements of
-** the database schema. This flags is especially recommended for SQL
+** the database schema. This flags is especially recommended for SQL
** functions that have side effects or reveal internal application state.
** Without this flag, an attacker might be able to modify the schema of
** a database file to include invocations of the function with parameters
@@ -6149,21 +6160,21 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
** SQL function or aggregate, pass NULL pointers for all three function
** callbacks.
**
-** ^The sixth, seventh, eighth and ninth parameters (xStep, xFinal, xValue
+** ^The sixth, seventh, eighth and ninth parameters (xStep, xFinal, xValue
** and xInverse) passed to sqlite3_create_window_function are pointers to
** C-language callbacks that implement the new function. xStep and xFinal
** must both be non-NULL. xValue and xInverse may either both be NULL, in
-** which case a regular aggregate function is created, or must both be
+** which case a regular aggregate function is created, or must both be
** non-NULL, in which case the new function may be used as either an aggregate
** or aggregate window function. More details regarding the implementation
-** of aggregate window functions are
+** of aggregate window functions are
** [user-defined window functions|available here].
**
** ^(If the final parameter to sqlite3_create_function_v2() or
** sqlite3_create_window_function() is not NULL, then it is destructor for
-** the application data pointer. The destructor is invoked when the function
-** is deleted, either by being overloaded or when the database connection
-** closes.)^ ^The destructor is also invoked if the call to
+** the application data pointer. The destructor is invoked when the function
+** is deleted, either by being overloaded or when the database connection
+** closes.)^ ^The destructor is also invoked if the call to
** sqlite3_create_function_v2() fails. ^When the destructor callback is
** invoked, it is passed a single argument which is a copy of the application
** data pointer which was the fifth parameter to sqlite3_create_function_v2().
@@ -6176,7 +6187,7 @@ SQLITE_API int sqlite3_reset(sqlite3_stmt *pStmt);
** nArg parameter is a better match than a function implementation with
** a negative nArg. ^A function where the preferred text encoding
** matches the database encoding is a better
-** match than a function where the encoding is different.
+** match than a function where the encoding is different.
** ^A function where the encoding difference is between UTF16le and UTF16be
** is a closer match than a function where the encoding difference is
** between UTF8 and UTF16.
@@ -6248,7 +6259,7 @@ SQLITE_API int sqlite3_create_window_function(
/*
** CAPI3REF: Function Flags
**
-** These constants may be ORed together with the
+** These constants may be ORed together with the
** [SQLITE_UTF8 | preferred text encoding] as the fourth argument
** to [sqlite3_create_function()], [sqlite3_create_function16()], or
** [sqlite3_create_function_v2()].
@@ -6264,10 +6275,10 @@ SQLITE_API int sqlite3_create_window_function(
** SQLite might also optimize deterministic functions by factoring them
** out of inner loops.
** </dd>
-**
+**
** [[SQLITE_DIRECTONLY]] <dt>SQLITE_DIRECTONLY</dt><dd>
** The SQLITE_DIRECTONLY flag means that the function may only be invoked
-** from top-level SQL, and cannot be used in VIEWs or TRIGGERs nor in
+** from top-level SQL, and cannot be used in VIEWs or TRIGGERs nor in
** schema structures such as [CHECK constraints], [DEFAULT clauses],
** [expression indexes], [partial indexes], or [generated columns].
** The SQLITE_DIRECTONLY flags is a security feature which is recommended
@@ -6320,7 +6331,7 @@ SQLITE_API int sqlite3_create_window_function(
** DEPRECATED
**
** These functions are [deprecated]. In order to maintain
-** backwards compatibility with older code, these functions continue
+** backwards compatibility with older code, these functions continue
** to be supported. However, new applications should avoid
** the use of these functions. To encourage programmers to avoid
** these functions, we will not explain what they do.
@@ -6388,11 +6399,11 @@ SQLITE_API SQLITE_DEPRECATED int sqlite3_memory_alarm(void(*)(void*,sqlite3_int6
** sqlite3_value_text16be() and sqlite3_value_text16le() interfaces
** extract UTF-16 strings as big-endian and little-endian respectively.
**
-** ^If [sqlite3_value] object V was initialized
+** ^If [sqlite3_value] object V was initialized
** using [sqlite3_bind_pointer(S,I,P,X,D)] or [sqlite3_result_pointer(C,P,X,D)]
** and if X and Y are strings that compare equal according to strcmp(X,Y),
** then sqlite3_value_pointer(V,Y) will return the pointer P. ^Otherwise,
-** sqlite3_value_pointer(V,Y) returns a NULL. The sqlite3_bind_pointer()
+** sqlite3_value_pointer(V,Y) returns a NULL. The sqlite3_bind_pointer()
** routine is part of the [pointer passing interface] added for SQLite 3.20.0.
**
** ^(The sqlite3_value_type(V) interface returns the
@@ -6515,7 +6526,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);
** Implementations of aggregate SQL functions use this
** routine to allocate memory for storing their state.
**
-** ^The first time the sqlite3_aggregate_context(C,N) routine is called
+** ^The first time the sqlite3_aggregate_context(C,N) routine is called
** for a particular aggregate function, SQLite allocates
** N bytes of memory, zeroes out that memory, and returns a pointer
** to the new memory. ^On second and subsequent calls to
@@ -6528,7 +6539,7 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);
** In those cases, sqlite3_aggregate_context() might be called for the
** first time from within xFinal().)^
**
-** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
+** ^The sqlite3_aggregate_context(C,N) routine returns a NULL pointer
** when first called if N is less than or equal to zero or if a memory
** allocate error occurs.
**
@@ -6537,10 +6548,10 @@ SQLITE_API void sqlite3_value_free(sqlite3_value*);
** value of N in any subsequent call to sqlite3_aggregate_context() within
** the same aggregate function instance will not resize the memory
** allocation.)^ Within the xFinal callback, it is customary to set
-** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
+** N=0 in calls to sqlite3_aggregate_context(C,N) so that no
** pointless memory allocations occur.
**
-** ^SQLite automatically frees the memory allocated by
+** ^SQLite automatically frees the memory allocated by
** sqlite3_aggregate_context() when the aggregate query concludes.
**
** The first parameter must be a copy of the
@@ -6590,7 +6601,7 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
** some circumstances the associated metadata may be preserved. An example
** of where this might be useful is in a regular-expression matching
** function. The compiled version of the regular expression can be stored as
-** metadata associated with the pattern string.
+** metadata associated with the pattern string.
** Then as long as the pattern string remains the same,
** the compiled regular expression can be reused on multiple
** invocations of the same function.
@@ -6616,10 +6627,10 @@ SQLITE_API sqlite3 *sqlite3_context_db_handle(sqlite3_context*);
** SQL statement)^, or
** <li> ^(when sqlite3_set_auxdata() is invoked again on the same
** parameter)^, or
-** <li> ^(during the original sqlite3_set_auxdata() call when a memory
+** <li> ^(during the original sqlite3_set_auxdata() call when a memory
** allocation error occurs.)^ </ul>
**
-** Note the last bullet in particular. The destructor X in
+** Note the last bullet in particular. The destructor X in
** sqlite3_set_auxdata(C,N,P,X) might be called immediately, before the
** sqlite3_set_auxdata() interface even returns. Hence sqlite3_set_auxdata()
** should be called near the end of the function implementation and the
@@ -6792,7 +6803,7 @@ typedef void (*sqlite3_destructor_type)(void*);
**
** ^The sqlite3_result_pointer(C,P,T,D) interface sets the result to an
** SQL NULL value, just like [sqlite3_result_null(C)], except that it
-** also associates the host-language pointer P or type T with that
+** also associates the host-language pointer P or type T with that
** NULL value such that the pointer can be retrieved within an
** [application-defined SQL function] using [sqlite3_value_pointer()].
** ^If the D parameter is not NULL, then it is a pointer to a destructor
@@ -6834,8 +6845,8 @@ SQLITE_API int sqlite3_result_zeroblob64(sqlite3_context*, sqlite3_uint64 n);
** METHOD: sqlite3_context
**
** The sqlite3_result_subtype(C,T) function causes the subtype of
-** the result from the [application-defined SQL function] with
-** [sqlite3_context] C to be the value T. Only the lower 8 bits
+** the result from the [application-defined SQL function] with
+** [sqlite3_context] C to be the value T. Only the lower 8 bits
** of the subtype T are preserved in current versions of SQLite;
** higher order bits are discarded.
** The number of subtype bytes preserved by SQLite might increase
@@ -6882,7 +6893,7 @@ SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);
** deleted. ^When all collating functions having the same name are deleted,
** that collation is no longer usable.
**
-** ^The collating function callback is invoked with a copy of the pArg
+** ^The collating function callback is invoked with a copy of the pArg
** application data pointer and with two strings in the encoding specified
** by the eTextRep argument. The two integer parameters to the collating
** function callback are the length of the two strings, in bytes. The collating
@@ -6913,36 +6924,36 @@ SQLITE_API void sqlite3_result_subtype(sqlite3_context*,unsigned int);
** calls to the collation creation functions or when the
** [database connection] is closed using [sqlite3_close()].
**
-** ^The xDestroy callback is <u>not</u> called if the
+** ^The xDestroy callback is <u>not</u> called if the
** sqlite3_create_collation_v2() function fails. Applications that invoke
-** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should
+** sqlite3_create_collation_v2() with a non-NULL xDestroy argument should
** check the return code and dispose of the application data pointer
** themselves rather than expecting SQLite to deal with it for them.
-** This is different from every other SQLite interface. The inconsistency
-** is unfortunate but cannot be changed without breaking backwards
+** This is different from every other SQLite interface. The inconsistency
+** is unfortunate but cannot be changed without breaking backwards
** compatibility.
**
** See also: [sqlite3_collation_needed()] and [sqlite3_collation_needed16()].
*/
SQLITE_API int sqlite3_create_collation(
- sqlite3*,
- const char *zName,
- int eTextRep,
+ sqlite3*,
+ const char *zName,
+ int eTextRep,
void *pArg,
int(*xCompare)(void*,int,const void*,int,const void*)
);
SQLITE_API int sqlite3_create_collation_v2(
- sqlite3*,
- const char *zName,
- int eTextRep,
+ sqlite3*,
+ const char *zName,
+ int eTextRep,
void *pArg,
int(*xCompare)(void*,int,const void*,int,const void*),
void(*xDestroy)(void*)
);
SQLITE_API int sqlite3_create_collation16(
- sqlite3*,
+ sqlite3*,
const void *zName,
- int eTextRep,
+ int eTextRep,
void *pArg,
int(*xCompare)(void*,int,const void*,int,const void*)
);
@@ -6975,19 +6986,19 @@ SQLITE_API int sqlite3_create_collation16(
** [sqlite3_create_collation_v2()].
*/
SQLITE_API int sqlite3_collation_needed(
- sqlite3*,
- void*,
+ sqlite3*,
+ void*,
void(*)(void*,sqlite3*,int eTextRep,const char*)
);
SQLITE_API int sqlite3_collation_needed16(
- sqlite3*,
+ sqlite3*,
void*,
void(*)(void*,sqlite3*,int eTextRep,const void*)
);
#ifdef SQLITE_ENABLE_CEROD
/*
-** Specify the activation key for a CEROD database. Unless
+** Specify the activation key for a CEROD database. Unless
** activated, none of the CEROD routines will work.
*/
SQLITE_API void sqlite3_activate_cerod(
@@ -7043,7 +7054,7 @@ SQLITE_API int sqlite3_sleep(int);
** ^The [temp_store_directory pragma] may modify this variable and cause
** it to point to memory obtained from [sqlite3_malloc]. ^Furthermore,
** the [temp_store_directory pragma] always assumes that any string
-** that this variable points to is held in memory obtained from
+** that this variable points to is held in memory obtained from
** [sqlite3_malloc] and the pragma may attempt to free that memory
** using [sqlite3_free].
** Hence, if this variable is modified directly, either it should be
@@ -7100,7 +7111,7 @@ SQLITE_API char *sqlite3_temp_directory;
** ^The [data_store_directory pragma] may modify this variable and cause
** it to point to memory obtained from [sqlite3_malloc]. ^Furthermore,
** the [data_store_directory pragma] always assumes that any string
-** that this variable points to is held in memory obtained from
+** that this variable points to is held in memory obtained from
** [sqlite3_malloc] and the pragma may attempt to free that memory
** using [sqlite3_free].
** Hence, if this variable is modified directly, either it should be
@@ -7313,7 +7324,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
** ^In the case of an update, this is the [rowid] after the update takes place.
**
** ^(The update hook is not invoked when internal system tables are
-** modified (i.e. sqlite_master and sqlite_sequence).)^
+** modified (i.e. sqlite_sequence).)^
** ^The update hook is not invoked when [WITHOUT ROWID] tables are modified.
**
** ^In the current implementation, the update hook
@@ -7339,7 +7350,7 @@ SQLITE_API void *sqlite3_rollback_hook(sqlite3*, void(*)(void *), void*);
** and [sqlite3_preupdate_hook()] interfaces.
*/
SQLITE_API void *sqlite3_update_hook(
- sqlite3*,
+ sqlite3*,
void(*)(void *,int ,char const *,char const *,sqlite3_int64),
void*
);
@@ -7353,7 +7364,7 @@ SQLITE_API void *sqlite3_update_hook(
** and disabled if the argument is false.)^
**
** ^Cache sharing is enabled and disabled for an entire process.
-** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]).
+** This is a change as of SQLite [version 3.5.0] ([dateof:3.5.0]).
** In prior versions of SQLite,
** sharing was enabled or disabled for each thread separately.
**
@@ -7374,8 +7385,8 @@ SQLITE_API void *sqlite3_update_hook(
** with the [SQLITE_OPEN_SHAREDCACHE] flag.
**
** Note: This method is disabled on MacOS X 10.7 and iOS version 5.0
-** and will always return SQLITE_MISUSE. On those systems,
-** shared cache mode should be enabled per-database connection via
+** and will always return SQLITE_MISUSE. On those systems,
+** shared cache mode should be enabled per-database connection via
** [sqlite3_open_v2()] with [SQLITE_OPEN_SHAREDCACHE].
**
** This interface is threadsafe on processors where writing a
@@ -7428,7 +7439,7 @@ SQLITE_API int sqlite3_db_release_memory(sqlite3*);
** as heap memory usages approaches the limit.
** ^The soft heap limit is "soft" because even though SQLite strives to stay
** below the limit, it will exceed the limit rather than generate
-** an [SQLITE_NOMEM] error. In other words, the soft heap limit
+** an [SQLITE_NOMEM] error. In other words, the soft heap limit
** is advisory only.
**
** ^The sqlite3_hard_heap_limit64(N) interface sets a hard upper bound of
@@ -7544,7 +7555,7 @@ SQLITE_API SQLITE_DEPRECATED void sqlite3_soft_heap_limit(int N);
**
** ^If the specified table is actually a view, an [error code] is returned.
**
-** ^If the specified column is "rowid", "oid" or "_rowid_" and the table
+** ^If the specified column is "rowid", "oid" or "_rowid_" and the table
** is not a [WITHOUT ROWID] table and an
** [INTEGER PRIMARY KEY] column has been explicitly declared, then the output
** parameters are set for the explicitly declared column. ^(If there is no
@@ -7610,7 +7621,7 @@ SQLITE_API int sqlite3_table_column_metadata(
** prior to calling this API,
** otherwise an error will be returned.
**
-** <b>Security warning:</b> It is recommended that the
+** <b>Security warning:</b> It is recommended that the
** [SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION] method be used to enable only this
** interface. The use of the [sqlite3_enable_load_extension()] interface
** should be avoided. This will keep the SQL function [load_extension()]
@@ -7697,7 +7708,7 @@ SQLITE_API int sqlite3_auto_extension(void(*xEntryPoint)(void));
** ^The [sqlite3_cancel_auto_extension(X)] interface unregisters the
** initialization routine X that was registered using a prior call to
** [sqlite3_auto_extension(X)]. ^The [sqlite3_cancel_auto_extension(X)]
-** routine returns 1 if initialization routine X was successfully
+** routine returns 1 if initialization routine X was successfully
** unregistered and it returns 0 if X was not on the list of initialization
** routines.
*/
@@ -7732,8 +7743,8 @@ typedef struct sqlite3_module sqlite3_module;
** CAPI3REF: Virtual Table Object
** KEYWORDS: sqlite3_module {virtual table module}
**
-** This structure, sometimes called a "virtual table module",
-** defines the implementation of a [virtual table].
+** This structure, sometimes called a "virtual table module",
+** defines the implementation of a [virtual table].
** This structure consists mostly of methods for the module.
**
** ^A virtual table module is created by filling in a persistent
@@ -7772,7 +7783,7 @@ struct sqlite3_module {
void (**pxFunc)(sqlite3_context*,int,sqlite3_value**),
void **ppArg);
int (*xRename)(sqlite3_vtab *pVtab, const char *zNew);
- /* The methods above are in version 1 of the sqlite_module object. Those
+ /* The methods above are in version 1 of the sqlite_module object. Those
** below are for version 2 and greater. */
int (*xSavepoint)(sqlite3_vtab *pVTab, int);
int (*xRelease)(sqlite3_vtab *pVTab, int);
@@ -7822,7 +7833,7 @@ struct sqlite3_module {
** required by SQLite. If the table has at least 64 columns and any column
** to the right of the first 63 is required, then bit 63 of colUsed is also
** set. In other words, column iCol may be required if the expression
-** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to
+** (colUsed & ((sqlite3_uint64)1 << (iCol>=63 ? 63 : iCol))) evaluates to
** non-zero.
**
** The [xBestIndex] method must fill aConstraintUsage[] with information
@@ -7849,17 +7860,17 @@ struct sqlite3_module {
**
** ^The estimatedCost value is an estimate of the cost of a particular
** strategy. A cost of N indicates that the cost of the strategy is similar
-** to a linear scan of an SQLite table with N rows. A cost of log(N)
+** to a linear scan of an SQLite table with N rows. A cost of log(N)
** indicates that the expense of the operation is similar to that of a
** binary search on a unique indexed field of an SQLite table with N rows.
**
** ^The estimatedRows value is an estimate of the number of rows that
** will be returned by the strategy.
**
-** The xBestIndex method may optionally populate the idxFlags field with a
+** The xBestIndex method may optionally populate the idxFlags field with a
** mask of SQLITE_INDEX_SCAN_* flags. Currently there is only one such flag -
** SQLITE_INDEX_SCAN_UNIQUE. If the xBestIndex method sets this flag, SQLite
-** assumes that the strategy may visit at most one row.
+** assumes that the strategy may visit at most one row.
**
** Additionally, if xBestIndex sets the SQLITE_INDEX_SCAN_UNIQUE flag, then
** SQLite also assumes that if a call to the xUpdate() method is made as
@@ -7872,14 +7883,14 @@ struct sqlite3_module {
** the xUpdate method are automatically rolled back by SQLite.
**
** IMPORTANT: The estimatedRows field was added to the sqlite3_index_info
-** structure for SQLite [version 3.8.2] ([dateof:3.8.2]).
+** structure for SQLite [version 3.8.2] ([dateof:3.8.2]).
** If a virtual table extension is
-** used with an SQLite version earlier than 3.8.2, the results of attempting
-** to read or write the estimatedRows field are undefined (but are likely
+** used with an SQLite version earlier than 3.8.2, the results of attempting
+** to read or write the estimatedRows field are undefined (but are likely
** to include crashing the application). The estimatedRows field should
** therefore only be used if [sqlite3_libversion_number()] returns a
** value greater than or equal to 3008002. Similarly, the idxFlags field
-** was added for [version 3.9.0] ([dateof:3.9.0]).
+** was added for [version 3.9.0] ([dateof:3.9.0]).
** It may therefore only be used if
** sqlite3_libversion_number() returns a value greater than or equal to
** 3009000.
@@ -7919,7 +7930,7 @@ struct sqlite3_index_info {
/*
** CAPI3REF: Virtual Table Scan Flags
**
-** Virtual table implementations are allowed to set the
+** Virtual table implementations are allowed to set the
** [sqlite3_index_info].idxFlags field to some combination of
** these bits.
*/
@@ -7959,7 +7970,7 @@ struct sqlite3_index_info {
** preexisting [virtual table] for the module.
**
** ^The module name is registered on the [database connection] specified
-** by the first parameter. ^The name of the module is given by the
+** by the first parameter. ^The name of the module is given by the
** second parameter. ^The third parameter is a pointer to
** the implementation of the [virtual table module]. ^The fourth
** parameter is an arbitrary client data pointer that is passed through
@@ -8074,7 +8085,7 @@ SQLITE_API int sqlite3_declare_vtab(sqlite3*, const char *zSQL);
** METHOD: sqlite3
**
** ^(Virtual tables can provide alternative implementations of functions
-** using the [xFindFunction] method of the [virtual table module].
+** using the [xFindFunction] method of the [virtual table module].
** But global versions of those functions
** must exist in order to be overloaded.)^
**
@@ -8125,7 +8136,7 @@ typedef struct sqlite3_blob sqlite3_blob;
** SELECT zColumn FROM zDb.zTable WHERE [rowid] = iRow;
** </pre>)^
**
-** ^(Parameter zDb is not the filename that contains the database, but
+** ^(Parameter zDb is not the filename that contains the database, but
** rather the symbolic name of the database. For attached databases, this is
** the name that appears after the AS keyword in the [ATTACH] statement.
** For the main database file, the database name is "main". For TEMP
@@ -8138,28 +8149,28 @@ typedef struct sqlite3_blob sqlite3_blob;
** ^(On success, [SQLITE_OK] is returned and the new [BLOB handle] is stored
** in *ppBlob. Otherwise an [error code] is returned and, unless the error
** code is SQLITE_MISUSE, *ppBlob is set to NULL.)^ ^This means that, provided
-** the API is not misused, it is always safe to call [sqlite3_blob_close()]
+** the API is not misused, it is always safe to call [sqlite3_blob_close()]
** on *ppBlob after this function it returns.
**
** This function fails with SQLITE_ERROR if any of the following are true:
** <ul>
-** <li> ^(Database zDb does not exist)^,
-** <li> ^(Table zTable does not exist within database zDb)^,
-** <li> ^(Table zTable is a WITHOUT ROWID table)^,
+** <li> ^(Database zDb does not exist)^,
+** <li> ^(Table zTable does not exist within database zDb)^,
+** <li> ^(Table zTable is a WITHOUT ROWID table)^,
** <li> ^(Column zColumn does not exist)^,
** <li> ^(Row iRow is not present in the table)^,
** <li> ^(The specified column of row iRow contains a value that is not
** a TEXT or BLOB value)^,
-** <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE
+** <li> ^(Column zColumn is part of an index, PRIMARY KEY or UNIQUE
** constraint and the blob is being opened for read/write access)^,
-** <li> ^([foreign key constraints | Foreign key constraints] are enabled,
+** <li> ^([foreign key constraints | Foreign key constraints] are enabled,
** column zColumn is part of a [child key] definition and the blob is
** being opened for read/write access)^.
** </ul>
**
-** ^Unless it returns SQLITE_MISUSE, this function sets the
-** [database connection] error code and message accessible via
-** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
+** ^Unless it returns SQLITE_MISUSE, this function sets the
+** [database connection] error code and message accessible via
+** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
**
** A BLOB referenced by sqlite3_blob_open() may be read using the
** [sqlite3_blob_read()] interface and modified by using
@@ -8185,7 +8196,7 @@ typedef struct sqlite3_blob sqlite3_blob;
** blob.
**
** ^The [sqlite3_bind_zeroblob()] and [sqlite3_result_zeroblob()] interfaces
-** and the built-in [zeroblob] SQL function may be used to create a
+** and the built-in [zeroblob] SQL function may be used to create a
** zero-filled blob to read or write using the incremental-blob interface.
**
** To avoid a resource leak, every open [BLOB handle] should eventually
@@ -8235,7 +8246,7 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
** DESTRUCTOR: sqlite3_blob
**
** ^This function closes an open [BLOB handle]. ^(The BLOB handle is closed
-** unconditionally. Even if this routine returns an error code, the
+** unconditionally. Even if this routine returns an error code, the
** handle is still closed.)^
**
** ^If the blob handle being closed was opened for read-write access, and if
@@ -8245,10 +8256,10 @@ SQLITE_API int sqlite3_blob_reopen(sqlite3_blob *, sqlite3_int64);
** code is returned and the transaction rolled back.
**
** Calling this function with an argument that is not a NULL pointer or an
-** open blob handle results in undefined behaviour. ^Calling this routine
-** with a null pointer (such as would be returned by a failed call to
+** open blob handle results in undefined behaviour. ^Calling this routine
+** with a null pointer (such as would be returned by a failed call to
** [sqlite3_blob_open()]) is a harmless no-op. ^Otherwise, if this function
-** is passed a valid open blob handle, the values returned by the
+** is passed a valid open blob handle, the values returned by the
** sqlite3_errcode() and sqlite3_errmsg() functions are set before returning.
*/
SQLITE_API int sqlite3_blob_close(sqlite3_blob *);
@@ -8257,7 +8268,7 @@ SQLITE_API int sqlite3_blob_close(sqlite3_blob *);
** CAPI3REF: Return The Size Of An Open BLOB
** METHOD: sqlite3_blob
**
-** ^Returns the size in bytes of the BLOB accessible via the
+** ^Returns the size in bytes of the BLOB accessible via the
** successfully opened [BLOB handle] in its only argument. ^The
** incremental blob I/O routines can only read or overwriting existing
** blob content; they cannot change the size of a blob.
@@ -8308,9 +8319,9 @@ SQLITE_API int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
**
** ^(On success, sqlite3_blob_write() returns SQLITE_OK.
** Otherwise, an [error code] or an [extended error code] is returned.)^
-** ^Unless SQLITE_MISUSE is returned, this function sets the
-** [database connection] error code and message accessible via
-** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
+** ^Unless SQLITE_MISUSE is returned, this function sets the
+** [database connection] error code and message accessible via
+** [sqlite3_errcode()] and [sqlite3_errmsg()] and related functions.
**
** ^If the [BLOB handle] passed as the first argument was not opened for
** writing (the flags parameter to [sqlite3_blob_open()] was zero),
@@ -8319,9 +8330,9 @@ SQLITE_API int sqlite3_blob_read(sqlite3_blob *, void *Z, int N, int iOffset);
** This function may only modify the contents of the BLOB; it is
** not possible to increase the size of a BLOB using this API.
** ^If offset iOffset is less than N bytes from the end of the BLOB,
-** [SQLITE_ERROR] is returned and no data is written. The size of the
-** BLOB (and hence the maximum value of N+iOffset) can be determined
-** using the [sqlite3_blob_bytes()] interface. ^If N or iOffset are less
+** [SQLITE_ERROR] is returned and no data is written. The size of the
+** BLOB (and hence the maximum value of N+iOffset) can be determined
+** using the [sqlite3_blob_bytes()] interface. ^If N or iOffset are less
** than zero [SQLITE_ERROR] is returned and no data is written.
**
** ^An attempt to write to an expired [BLOB handle] fails with an
@@ -8415,7 +8426,7 @@ SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);
** <ul>
** <li> SQLITE_MUTEX_FAST
** <li> SQLITE_MUTEX_RECURSIVE
-** <li> SQLITE_MUTEX_STATIC_MASTER
+** <li> SQLITE_MUTEX_STATIC_MAIN
** <li> SQLITE_MUTEX_STATIC_MEM
** <li> SQLITE_MUTEX_STATIC_OPEN
** <li> SQLITE_MUTEX_STATIC_PRNG
@@ -8473,7 +8484,7 @@ SQLITE_API int sqlite3_vfs_unregister(sqlite3_vfs*);
** ^(Some systems (for example, Windows 95) do not support the operation
** implemented by sqlite3_mutex_try(). On those systems, sqlite3_mutex_try()
** will always return SQLITE_BUSY. The SQLite core only ever uses
-** sqlite3_mutex_try() as an optimization so this is acceptable
+** sqlite3_mutex_try() as an optimization so this is acceptable
** behavior.)^
**
** ^The sqlite3_mutex_leave() routine exits a mutex that was
@@ -8617,7 +8628,7 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
*/
#define SQLITE_MUTEX_FAST 0
#define SQLITE_MUTEX_RECURSIVE 1
-#define SQLITE_MUTEX_STATIC_MASTER 2
+#define SQLITE_MUTEX_STATIC_MAIN 2
#define SQLITE_MUTEX_STATIC_MEM 3 /* sqlite3_malloc() */
#define SQLITE_MUTEX_STATIC_MEM2 4 /* NOT USED */
#define SQLITE_MUTEX_STATIC_OPEN 4 /* sqlite3BtreeOpen() */
@@ -8632,11 +8643,15 @@ SQLITE_API int sqlite3_mutex_notheld(sqlite3_mutex*);
#define SQLITE_MUTEX_STATIC_VFS2 12 /* For use by extension VFS */
#define SQLITE_MUTEX_STATIC_VFS3 13 /* For use by application VFS */
+/* Legacy compatibility: */
+#define SQLITE_MUTEX_STATIC_MASTER 2
+
+
/*
** CAPI3REF: Retrieve the mutex for a database connection
** METHOD: sqlite3
**
-** ^This interface returns a pointer the [sqlite3_mutex] object that
+** ^This interface returns a pointer the [sqlite3_mutex] object that
** serializes access to the [database connection] given in the argument
** when the [threading mode] is Serialized.
** ^If the [threading mode] is Single-thread or Multi-thread then this
@@ -8663,7 +8678,7 @@ SQLITE_API sqlite3_mutex *sqlite3_db_mutex(sqlite3*);
** method becomes the return value of this routine.
**
** A few opcodes for [sqlite3_file_control()] are handled directly
-** by the SQLite core and never invoke the
+** by the SQLite core and never invoke the
** sqlite3_io_methods.xFileControl method.
** ^The [SQLITE_FCNTL_FILE_POINTER] value for the op parameter causes
** a pointer to the underlying [sqlite3_file] object to be written into
@@ -8750,7 +8765,7 @@ SQLITE_API int sqlite3_test_control(int op, ...);
/*
** CAPI3REF: SQL Keyword Checking
**
-** These routines provide access to the set of SQL language keywords
+** These routines provide access to the set of SQL language keywords
** recognized by SQLite. Applications can uses these routines to determine
** whether or not a specific identifier needs to be escaped (for example,
** by enclosing in double-quotes) so as not to confuse the parser.
@@ -8822,14 +8837,14 @@ typedef struct sqlite3_str sqlite3_str;
**
** ^The [sqlite3_str_new(D)] interface allocates and initializes
** a new [sqlite3_str] object. To avoid memory leaks, the object returned by
-** [sqlite3_str_new()] must be freed by a subsequent call to
+** [sqlite3_str_new()] must be freed by a subsequent call to
** [sqlite3_str_finish(X)].
**
** ^The [sqlite3_str_new(D)] interface always returns a pointer to a
** valid [sqlite3_str] object, though in the event of an out-of-memory
** error the returned object might be a special singleton that will
-** silently reject new text, always return SQLITE_NOMEM from
-** [sqlite3_str_errcode()], always return 0 for
+** silently reject new text, always return SQLITE_NOMEM from
+** [sqlite3_str_errcode()], always return 0 for
** [sqlite3_str_length()], and always return NULL from
** [sqlite3_str_finish(X)]. It is always safe to use the value
** returned by [sqlite3_str_new(D)] as the sqlite3_str parameter
@@ -8865,9 +8880,9 @@ SQLITE_API char *sqlite3_str_finish(sqlite3_str*);
** These interfaces add content to an sqlite3_str object previously obtained
** from [sqlite3_str_new()].
**
-** ^The [sqlite3_str_appendf(X,F,...)] and
+** ^The [sqlite3_str_appendf(X,F,...)] and
** [sqlite3_str_vappendf(X,F,V)] interfaces uses the [built-in printf]
-** functionality of SQLite to append formatted text onto the end of
+** functionality of SQLite to append formatted text onto the end of
** [sqlite3_str] object X.
**
** ^The [sqlite3_str_append(X,S,N)] method appends exactly N bytes from string S
@@ -8884,7 +8899,7 @@ SQLITE_API char *sqlite3_str_finish(sqlite3_str*);
** ^This method can be used, for example, to add whitespace indentation.
**
** ^The [sqlite3_str_reset(X)] method resets the string under construction
-** inside [sqlite3_str] object X back to zero bytes in length.
+** inside [sqlite3_str] object X back to zero bytes in length.
**
** These methods do not return a result code. ^If an error occurs, that fact
** is recorded in the [sqlite3_str] object and can be recovered by a
@@ -8986,7 +9001,7 @@ SQLITE_API int sqlite3_status64(
** <dd>This parameter records the largest memory allocation request
** handed to [sqlite3_malloc()] or [sqlite3_realloc()] (or their
** internal equivalents). Only the value returned in the
-** *pHighwater parameter to [sqlite3_status()] is of interest.
+** *pHighwater parameter to [sqlite3_status()] is of interest.
** The value written into the *pCurrent parameter is undefined.</dd>)^
**
** [[SQLITE_STATUS_MALLOC_COUNT]] ^(<dt>SQLITE_STATUS_MALLOC_COUNT</dt>
@@ -8995,11 +9010,11 @@ SQLITE_API int sqlite3_status64(
**
** [[SQLITE_STATUS_PAGECACHE_USED]] ^(<dt>SQLITE_STATUS_PAGECACHE_USED</dt>
** <dd>This parameter returns the number of pages used out of the
-** [pagecache memory allocator] that was configured using
+** [pagecache memory allocator] that was configured using
** [SQLITE_CONFIG_PAGECACHE]. The
** value returned is in pages, not in bytes.</dd>)^
**
-** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]]
+** [[SQLITE_STATUS_PAGECACHE_OVERFLOW]]
** ^(<dt>SQLITE_STATUS_PAGECACHE_OVERFLOW</dt>
** <dd>This parameter returns the number of bytes of page cache
** allocation which could not be satisfied by the [SQLITE_CONFIG_PAGECACHE]
@@ -9012,7 +9027,7 @@ SQLITE_API int sqlite3_status64(
** [[SQLITE_STATUS_PAGECACHE_SIZE]] ^(<dt>SQLITE_STATUS_PAGECACHE_SIZE</dt>
** <dd>This parameter records the largest memory allocation request
** handed to the [pagecache memory allocator]. Only the value returned in the
-** *pHighwater parameter to [sqlite3_status()] is of interest.
+** *pHighwater parameter to [sqlite3_status()] is of interest.
** The value written into the *pCurrent parameter is undefined.</dd>)^
**
** [[SQLITE_STATUS_SCRATCH_USED]] <dt>SQLITE_STATUS_SCRATCH_USED</dt>
@@ -9025,7 +9040,7 @@ SQLITE_API int sqlite3_status64(
** <dd>No longer used.</dd>
**
** [[SQLITE_STATUS_PARSER_STACK]] ^(<dt>SQLITE_STATUS_PARSER_STACK</dt>
-** <dd>The *pHighwater parameter records the deepest parser stack.
+** <dd>The *pHighwater parameter records the deepest parser stack.
** The *pCurrent value is undefined. The *pHighwater value is only
** meaningful if SQLite is compiled with [YYTRACKMAXSTACKDEPTH].</dd>)^
** </dl>
@@ -9047,12 +9062,12 @@ SQLITE_API int sqlite3_status64(
** CAPI3REF: Database Connection Status
** METHOD: sqlite3
**
-** ^This interface is used to retrieve runtime status information
+** ^This interface is used to retrieve runtime status information
** about a single [database connection]. ^The first argument is the
** database connection object to be interrogated. ^The second argument
** is an integer constant, taken from the set of
** [SQLITE_DBSTATUS options], that
-** determines the parameter to interrogate. The set of
+** determines the parameter to interrogate. The set of
** [SQLITE_DBSTATUS options] is likely
** to grow in future releases of SQLite.
**
@@ -9087,7 +9102,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
** checked out.</dd>)^
**
** [[SQLITE_DBSTATUS_LOOKASIDE_HIT]] ^(<dt>SQLITE_DBSTATUS_LOOKASIDE_HIT</dt>
-** <dd>This parameter returns the number of malloc attempts that were
+** <dd>This parameter returns the number of malloc attempts that were
** satisfied using lookaside memory. Only the high-water value is meaningful;
** the current value is always zero.)^
**
@@ -9112,7 +9127,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
** memory used by all pager caches associated with the database connection.)^
** ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_USED is always 0.
**
-** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
+** [[SQLITE_DBSTATUS_CACHE_USED_SHARED]]
** ^(<dt>SQLITE_DBSTATUS_CACHE_USED_SHARED</dt>
** <dd>This parameter is similar to DBSTATUS_CACHE_USED, except that if a
** pager cache is shared between two or more connections the bytes of heap
@@ -9127,7 +9142,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
** [[SQLITE_DBSTATUS_SCHEMA_USED]] ^(<dt>SQLITE_DBSTATUS_SCHEMA_USED</dt>
** <dd>This parameter returns the approximate number of bytes of heap
** memory used to store the schema for all databases associated
-** with the connection - main, temp, and any [ATTACH]-ed databases.)^
+** with the connection - main, temp, and any [ATTACH]-ed databases.)^
** ^The full amount of memory used by the schemas is reported, even if the
** schema memory is shared with other database connections due to
** [shared cache mode] being enabled.
@@ -9142,13 +9157,13 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
**
** [[SQLITE_DBSTATUS_CACHE_HIT]] ^(<dt>SQLITE_DBSTATUS_CACHE_HIT</dt>
** <dd>This parameter returns the number of pager cache hits that have
-** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT
+** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_HIT
** is always 0.
** </dd>
**
** [[SQLITE_DBSTATUS_CACHE_MISS]] ^(<dt>SQLITE_DBSTATUS_CACHE_MISS</dt>
** <dd>This parameter returns the number of pager cache misses that have
-** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS
+** occurred.)^ ^The highwater mark associated with SQLITE_DBSTATUS_CACHE_MISS
** is always 0.
** </dd>
**
@@ -9206,7 +9221,7 @@ SQLITE_API int sqlite3_db_status(sqlite3*, int op, int *pCur, int *pHiwtr, int r
** statements. For example, if the number of table steps greatly exceeds
** the number of table searches or result rows, that would tend to indicate
** that the prepared statement is using a full table scan rather than
-** an index.
+** an index.
**
** ^(This interface is used to retrieve and reset counter values from
** a [prepared statement]. The first argument is the prepared statement
@@ -9233,7 +9248,7 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
** [[SQLITE_STMTSTATUS_FULLSCAN_STEP]] <dt>SQLITE_STMTSTATUS_FULLSCAN_STEP</dt>
** <dd>^This is the number of times that SQLite has stepped forward in
** a table as part of a full table scan. Large numbers for this counter
-** may indicate opportunities for performance improvement through
+** may indicate opportunities for performance improvement through
** careful use of indices.</dd>
**
** [[SQLITE_STMTSTATUS_SORT]] <dt>SQLITE_STMTSTATUS_SORT</dt>
@@ -9251,14 +9266,14 @@ SQLITE_API int sqlite3_stmt_status(sqlite3_stmt*, int op,int resetFlg);
** [[SQLITE_STMTSTATUS_VM_STEP]] <dt>SQLITE_STMTSTATUS_VM_STEP</dt>
** <dd>^This is the number of virtual machine operations executed
** by the prepared statement if that number is less than or equal
-** to 2147483647. The number of virtual machine operations can be
+** to 2147483647. The number of virtual machine operations can be
** used as a proxy for the total work done by the prepared statement.
** If the number of virtual machine operations exceeds 2147483647
** then the value returned by this statement status code is undefined.
**
** [[SQLITE_STMTSTATUS_REPREPARE]] <dt>SQLITE_STMTSTATUS_REPREPARE</dt>
** <dd>^This is the number of times that the prepare statement has been
-** automatically regenerated due to schema changes or changes to
+** automatically regenerated due to schema changes or changes to
** [bound parameters] that might affect the query plan.
**
** [[SQLITE_STMTSTATUS_RUN]] <dt>SQLITE_STMTSTATUS_RUN</dt>
@@ -9318,15 +9333,15 @@ struct sqlite3_pcache_page {
** KEYWORDS: {page cache}
**
** ^(The [sqlite3_config]([SQLITE_CONFIG_PCACHE2], ...) interface can
-** register an alternative page cache implementation by passing in an
+** register an alternative page cache implementation by passing in an
** instance of the sqlite3_pcache_methods2 structure.)^
-** In many applications, most of the heap memory allocated by
+** In many applications, most of the heap memory allocated by
** SQLite is used for the page cache.
-** By implementing a
+** By implementing a
** custom page cache using this API, an application can better control
-** the amount of memory consumed by SQLite, the way in which
-** that memory is allocated and released, and the policies used to
-** determine exactly which parts of a database file are cached and for
+** the amount of memory consumed by SQLite, the way in which
+** that memory is allocated and released, and the policies used to
+** determine exactly which parts of a database file are cached and for
** how long.
**
** The alternative page cache mechanism is an
@@ -9339,19 +9354,19 @@ struct sqlite3_pcache_page {
** [sqlite3_config()] returns.)^
**
** [[the xInit() page cache method]]
-** ^(The xInit() method is called once for each effective
+** ^(The xInit() method is called once for each effective
** call to [sqlite3_initialize()])^
** (usually only once during the lifetime of the process). ^(The xInit()
** method is passed a copy of the sqlite3_pcache_methods2.pArg value.)^
-** The intent of the xInit() method is to set up global data structures
-** required by the custom page cache implementation.
-** ^(If the xInit() method is NULL, then the
+** The intent of the xInit() method is to set up global data structures
+** required by the custom page cache implementation.
+** ^(If the xInit() method is NULL, then the
** built-in default page cache is used instead of the application defined
** page cache.)^
**
** [[the xShutdown() page cache method]]
** ^The xShutdown() method is called by [sqlite3_shutdown()].
-** It can be used to clean up
+** It can be used to clean up
** any outstanding resources before process shutdown, if required.
** ^The xShutdown() method may be NULL.
**
@@ -9370,7 +9385,7 @@ struct sqlite3_pcache_page {
** though this is not guaranteed. ^The
** first parameter, szPage, is the size in bytes of the pages that must
** be allocated by the cache. ^szPage will always a power of two. ^The
-** second parameter szExtra is a number of bytes of extra storage
+** second parameter szExtra is a number of bytes of extra storage
** associated with each page cache entry. ^The szExtra parameter will
** a number less than 250. SQLite will use the
** extra szExtra bytes on each page to store metadata about the underlying
@@ -9383,7 +9398,7 @@ struct sqlite3_pcache_page {
** it is purely advisory. ^On a cache where bPurgeable is false, SQLite will
** never invoke xUnpin() except to deliberately delete a page.
** ^In other words, calls to xUnpin() on a cache with bPurgeable set to
-** false will always have the "discard" flag set to true.
+** false will always have the "discard" flag set to true.
** ^Hence, a cache created with bPurgeable false will
** never contain any unpinned pages.
**
@@ -9398,12 +9413,12 @@ struct sqlite3_pcache_page {
** [[the xPagecount() page cache methods]]
** The xPagecount() method must return the number of pages currently
** stored in the cache, both pinned and unpinned.
-**
+**
** [[the xFetch() page cache methods]]
-** The xFetch() method locates a page in the cache and returns a pointer to
+** The xFetch() method locates a page in the cache and returns a pointer to
** an sqlite3_pcache_page object associated with that page, or a NULL pointer.
** The pBuf element of the returned sqlite3_pcache_page object will be a
-** pointer to a buffer of szPage bytes used to store the content of a
+** pointer to a buffer of szPage bytes used to store the content of a
** single database page. The pExtra element of sqlite3_pcache_page will be
** a pointer to the szExtra bytes of extra storage that SQLite has requested
** for each entry in the page cache.
@@ -9442,8 +9457,8 @@ struct sqlite3_pcache_page {
** page cache implementation. ^The page cache implementation
** may choose to evict unpinned pages at any time.
**
-** The cache must not perform any reference counting. A single
-** call to xUnpin() unpins the page regardless of the number of prior calls
+** The cache must not perform any reference counting. A single
+** call to xUnpin() unpins the page regardless of the number of prior calls
** to xFetch().
**
** [[the xRekey() page cache methods]]
@@ -9483,7 +9498,7 @@ struct sqlite3_pcache_methods2 {
int (*xPagecount)(sqlite3_pcache*);
sqlite3_pcache_page *(*xFetch)(sqlite3_pcache*, unsigned key, int createFlag);
void (*xUnpin)(sqlite3_pcache*, sqlite3_pcache_page*, int discard);
- void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*,
+ void (*xRekey)(sqlite3_pcache*, sqlite3_pcache_page*,
unsigned oldKey, unsigned newKey);
void (*xTruncate)(sqlite3_pcache*, unsigned iLimit);
void (*xDestroy)(sqlite3_pcache*);
@@ -9528,7 +9543,7 @@ typedef struct sqlite3_backup sqlite3_backup;
**
** The backup API copies the content of one database into another.
** It is useful either for creating backups of databases or
-** for copying in-memory databases to or from persistent files.
+** for copying in-memory databases to or from persistent files.
**
** See Also: [Using the SQLite Online Backup API]
**
@@ -9539,36 +9554,36 @@ typedef struct sqlite3_backup sqlite3_backup;
** ^Thus, the backup may be performed on a live source database without
** preventing other database connections from
** reading or writing to the source database while the backup is underway.
-**
-** ^(To perform a backup operation:
+**
+** ^(To perform a backup operation:
** <ol>
** <li><b>sqlite3_backup_init()</b> is called once to initialize the
-** backup,
-** <li><b>sqlite3_backup_step()</b> is called one or more times to transfer
+** backup,
+** <li><b>sqlite3_backup_step()</b> is called one or more times to transfer
** the data between the two databases, and finally
-** <li><b>sqlite3_backup_finish()</b> is called to release all resources
-** associated with the backup operation.
+** <li><b>sqlite3_backup_finish()</b> is called to release all resources
+** associated with the backup operation.
** </ol>)^
** There should be exactly one call to sqlite3_backup_finish() for each
** successful call to sqlite3_backup_init().
**
** [[sqlite3_backup_init()]] <b>sqlite3_backup_init()</b>
**
-** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the
-** [database connection] associated with the destination database
+** ^The D and N arguments to sqlite3_backup_init(D,N,S,M) are the
+** [database connection] associated with the destination database
** and the database name, respectively.
** ^The database name is "main" for the main database, "temp" for the
** temporary database, or the name specified after the AS keyword in
** an [ATTACH] statement for an attached database.
-** ^The S and M arguments passed to
+** ^The S and M arguments passed to
** sqlite3_backup_init(D,N,S,M) identify the [database connection]
** and database name of the source database, respectively.
** ^The source and destination [database connections] (parameters S and D)
** must be different or else sqlite3_backup_init(D,N,S,M) will fail with
** an error.
**
-** ^A call to sqlite3_backup_init() will fail, returning NULL, if
-** there is already a read or read-write transaction open on the
+** ^A call to sqlite3_backup_init() will fail, returning NULL, if
+** there is already a read or read-write transaction open on the
** destination database.
**
** ^If an error occurs within sqlite3_backup_init(D,N,S,M), then NULL is
@@ -9580,14 +9595,14 @@ typedef struct sqlite3_backup sqlite3_backup;
** ^A successful call to sqlite3_backup_init() returns a pointer to an
** [sqlite3_backup] object.
** ^The [sqlite3_backup] object may be used with the sqlite3_backup_step() and
-** sqlite3_backup_finish() functions to perform the specified backup
+** sqlite3_backup_finish() functions to perform the specified backup
** operation.
**
** [[sqlite3_backup_step()]] <b>sqlite3_backup_step()</b>
**
-** ^Function sqlite3_backup_step(B,N) will copy up to N pages between
+** ^Function sqlite3_backup_step(B,N) will copy up to N pages between
** the source and destination databases specified by [sqlite3_backup] object B.
-** ^If N is negative, all remaining source pages are copied.
+** ^If N is negative, all remaining source pages are copied.
** ^If sqlite3_backup_step(B,N) successfully copies N pages and there
** are still more pages to be copied, then the function returns [SQLITE_OK].
** ^If sqlite3_backup_step(B,N) successfully finishes copying all pages
@@ -9609,8 +9624,8 @@ typedef struct sqlite3_backup sqlite3_backup;
**
** ^If sqlite3_backup_step() cannot obtain a required file-system lock, then
** the [sqlite3_busy_handler | busy-handler function]
-** is invoked (if one is specified). ^If the
-** busy-handler returns non-zero before the lock is available, then
+** is invoked (if one is specified). ^If the
+** busy-handler returns non-zero before the lock is available, then
** [SQLITE_BUSY] is returned to the caller. ^In this case the call to
** sqlite3_backup_step() can be retried later. ^If the source
** [database connection]
@@ -9618,15 +9633,15 @@ typedef struct sqlite3_backup sqlite3_backup;
** is called, then [SQLITE_LOCKED] is returned immediately. ^Again, in this
** case the call to sqlite3_backup_step() can be retried later on. ^(If
** [SQLITE_IOERR_ACCESS | SQLITE_IOERR_XXX], [SQLITE_NOMEM], or
-** [SQLITE_READONLY] is returned, then
-** there is no point in retrying the call to sqlite3_backup_step(). These
-** errors are considered fatal.)^ The application must accept
-** that the backup operation has failed and pass the backup operation handle
+** [SQLITE_READONLY] is returned, then
+** there is no point in retrying the call to sqlite3_backup_step(). These
+** errors are considered fatal.)^ The application must accept
+** that the backup operation has failed and pass the backup operation handle
** to the sqlite3_backup_finish() to release associated resources.
**
** ^The first call to sqlite3_backup_step() obtains an exclusive lock
-** on the destination file. ^The exclusive lock is not released until either
-** sqlite3_backup_finish() is called or the backup operation is complete
+** on the destination file. ^The exclusive lock is not released until either
+** sqlite3_backup_finish() is called or the backup operation is complete
** and sqlite3_backup_step() returns [SQLITE_DONE]. ^Every call to
** sqlite3_backup_step() obtains a [shared lock] on the source database that
** lasts for the duration of the sqlite3_backup_step() call.
@@ -9635,18 +9650,18 @@ typedef struct sqlite3_backup sqlite3_backup;
** through the backup process. ^If the source database is modified by an
** external process or via a database connection other than the one being
** used by the backup operation, then the backup will be automatically
-** restarted by the next call to sqlite3_backup_step(). ^If the source
+** restarted by the next call to sqlite3_backup_step(). ^If the source
** database is modified by the using the same database connection as is used
** by the backup operation, then the backup database is automatically
** updated at the same time.
**
** [[sqlite3_backup_finish()]] <b>sqlite3_backup_finish()</b>
**
-** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the
+** When sqlite3_backup_step() has returned [SQLITE_DONE], or when the
** application wishes to abandon the backup operation, the application
** should destroy the [sqlite3_backup] by passing it to sqlite3_backup_finish().
** ^The sqlite3_backup_finish() interfaces releases all
-** resources associated with the [sqlite3_backup] object.
+** resources associated with the [sqlite3_backup] object.
** ^If sqlite3_backup_step() has not yet returned [SQLITE_DONE], then any
** active write-transaction on the destination database is rolled back.
** The [sqlite3_backup] object is invalid
@@ -9686,8 +9701,8 @@ typedef struct sqlite3_backup sqlite3_backup;
** connections, then the source database connection may be used concurrently
** from within other threads.
**
-** However, the application must guarantee that the destination
-** [database connection] is not passed to any other API (by any thread) after
+** However, the application must guarantee that the destination
+** [database connection] is not passed to any other API (by any thread) after
** sqlite3_backup_init() is called and before the corresponding call to
** sqlite3_backup_finish(). SQLite does not currently check to see
** if the application incorrectly accesses the destination [database connection]
@@ -9698,11 +9713,11 @@ typedef struct sqlite3_backup sqlite3_backup;
** If running in [shared cache mode], the application must
** guarantee that the shared cache used by the destination database
** is not accessed while the backup is running. In practice this means
-** that the application must guarantee that the disk file being
+** that the application must guarantee that the disk file being
** backed up to is not accessed by any connection within the process,
** not just the specific connection that was passed to sqlite3_backup_init().
**
-** The [sqlite3_backup] object itself is partially threadsafe. Multiple
+** The [sqlite3_backup] object itself is partially threadsafe. Multiple
** threads may safely make multiple concurrent calls to sqlite3_backup_step().
** However, the sqlite3_backup_remaining() and sqlite3_backup_pagecount()
** APIs are not strictly speaking threadsafe. If they are invoked at the
@@ -9727,8 +9742,8 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);
** ^When running in shared-cache mode, a database operation may fail with
** an [SQLITE_LOCKED] error if the required locks on the shared-cache or
** individual tables within the shared-cache cannot be obtained. See
-** [SQLite Shared-Cache Mode] for a description of shared-cache locking.
-** ^This API may be used to register a callback that SQLite will invoke
+** [SQLite Shared-Cache Mode] for a description of shared-cache locking.
+** ^This API may be used to register a callback that SQLite will invoke
** when the connection currently holding the required lock relinquishes it.
** ^This API is only available if the library was compiled with the
** [SQLITE_ENABLE_UNLOCK_NOTIFY] C-preprocessor symbol defined.
@@ -9736,14 +9751,14 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);
** See Also: [Using the SQLite Unlock Notification Feature].
**
** ^Shared-cache locks are released when a database connection concludes
-** its current transaction, either by committing it or rolling it back.
+** its current transaction, either by committing it or rolling it back.
**
** ^When a connection (known as the blocked connection) fails to obtain a
** shared-cache lock and SQLITE_LOCKED is returned to the caller, the
** identity of the database connection (the blocking connection) that
-** has locked the required resource is stored internally. ^After an
+** has locked the required resource is stored internally. ^After an
** application receives an SQLITE_LOCKED error, it may call the
-** sqlite3_unlock_notify() method with the blocked connection handle as
+** sqlite3_unlock_notify() method with the blocked connection handle as
** the first argument to register for a callback that will be invoked
** when the blocking connections current transaction is concluded. ^The
** callback is invoked from within the [sqlite3_step] or [sqlite3_close]
@@ -9757,15 +9772,15 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);
**
** ^If the blocked connection is attempting to obtain a write-lock on a
** shared-cache table, and more than one other connection currently holds
-** a read-lock on the same table, then SQLite arbitrarily selects one of
+** a read-lock on the same table, then SQLite arbitrarily selects one of
** the other connections to use as the blocking connection.
**
-** ^(There may be at most one unlock-notify callback registered by a
+** ^(There may be at most one unlock-notify callback registered by a
** blocked connection. If sqlite3_unlock_notify() is called when the
** blocked connection already has a registered unlock-notify callback,
** then the new callback replaces the old.)^ ^If sqlite3_unlock_notify() is
** called with a NULL pointer as its second argument, then any existing
-** unlock-notify callback is canceled. ^The blocked connections
+** unlock-notify callback is canceled. ^The blocked connections
** unlock-notify callback may also be canceled by closing the blocked
** connection using [sqlite3_close()].
**
@@ -9778,7 +9793,7 @@ SQLITE_API int sqlite3_backup_pagecount(sqlite3_backup *p);
**
** <b>Callback Invocation Details</b>
**
-** When