Update Qt doc links to 6.5

ucam-department-of-psychiatry · Jan 4, 2024 · 1ea8ab7 · 1ea8ab7
1 parent 2d47414
commit 1ea8ab7
Show file tree

Hide file tree

Showing 49 changed files with 111 additions and 113 deletions.
diff --git a/docs/source/developer/creating_tasks.rst b/docs/source/developer/creating_tasks.rst
@@ -223,7 +223,7 @@ More dynamic content usually requires that the Task objects keeps some sort of
 reference to the questionnaire during editing. The simplest way is to keep a
 safe pointer to the Questionnaire (``QPointer<Questionnaire> m_questionnaire``)
 but you can keep pointers to more detailed things too. (The task will not *own*
-the Questionnaire. A `QPointer <http://doc.qt.io/qt-5/qpointer.html>`_ is
+the Questionnaire. A `QPointer <https://doc.qt.io/qt-6.5/qpointer.html>`_ is
 automatically set to zero when its referenced object is destroyed.)
 
 Since ``FieldRef`` objects also maintain a **mandatory** flag, data input can

diff --git a/docs/source/faq_known_problems.rst b/docs/source/faq_known_problems.rst
@@ -295,4 +295,4 @@ How to upgrade Android
 
 .. [#qtandroiapi]
 
-    http://doc.qt.io/qt-5/android-support.html
+    https://doc.qt.io/qt-6.5/android-support.html
diff --git a/docs/source/to_do.rst b/docs/source/to_do.rst
@@ -143,7 +143,7 @@ Client core
 
 - Maybe implement pinch zoom for some subclasses of OpenableWidget, e.g.
   MenuWindow and Questionaire. See
-  http://doc.qt.io/qt-5/qtwidgets-gestures-imagegestures-example.html
+  https://doc.qt.io/qt-6.5/qtwidgets-gestures-imagegestures-example.html
 
 - QuAudioRecording: questionnaire element to record audio
 

diff --git a/tablet_qt/camcops.pro b/tablet_qt/camcops.pro
@@ -17,8 +17,8 @@
 #   along with CamCOPS. If not, see <https://www.gnu.org/licenses/>.
 
 
-# http://doc.qt.io/qt-5/qmake-project-files.html
-# http://doc.qt.io/qt-5/qmake-variable-reference.html
+# https://doc.qt.io/qt-6.5/qmake-project-files.html
+# https://doc.qt.io/qt-6.5/qmake-variable-reference.html
 
 message("+++ CamCOPS qmake starting.")
 
@@ -34,8 +34,8 @@ message("+++ CamCOPS qmake starting.")
 # Use $(...) to read an environment variable at the time of make.
 # Use $$... or $${...} to read a Qt project file variable.
 # See
-# - http://doc.qt.io/qt-4.8/qmake-advanced-usage.html#variables
-# - http://doc.qt.io/qt-5/qmake-test-function-reference.html
+# - https://doc.qt.io/qt-6.5/qmake-advanced-usage.html#variables
+# - https://doc.qt.io/qt-6.5/qmake-test-function-reference.html
 # Here, we copy an environment variable to a Qt project file variable:
 # QT_BASE_DIR = $(CAMCOPS_QT6_BASE_DIR)  # value at time of make
 
@@ -73,10 +73,10 @@ message("... QT_ARCH: $${QT_ARCH}")
 # ALSO TRY:
 #   qmake -query  # for the qmake of the Qt build you're using
 
-# http://doc.qt.io/qt-5/qtmultimedia-index.html
+# https://doc.qt.io/qt-6.5/qtmultimedia-index.html
 # http://wiki.qt.io/Qt_5.5.0_Multimedia_Backends
-# http://doc.qt.io/qt-4.8/qmake-variable-reference.html#qt
-# http://doc.qt.io/qt-5/qtmodules.html
+# https://doc.qt.io/qt-6.5/qmake-variable-reference.html#qt
+# https://doc.qt.io/qt-6.5/qtmodules.html
 
 QT += core  # included by default; QtCore module
 QT += gui  # included by default; QtGui module
@@ -131,7 +131,7 @@ MOBILITY =
 # ... http://stackoverflow.com/questions/14681012/how-to-include-openssl-in-a-qt-project
 # ... but no effect? Not mentioned in variable reference (above).
 # ... ah, here's the reference:
-#     http://doc.qt.io/qt-5/qmake-project-files.html
+#     https://doc.qt.io/qt-6.5/qmake-project-files.html
 # LIBS += -lssl
 # ... not working either? Doesn't complain, but ldd still shows that system libssl.so is in use
 
@@ -313,7 +313,7 @@ android {
         CAMCOPS_ARCH_TAG = "android_armv8_64"
     }
 
-    # http://doc.qt.io/qt-5/deployment-android.html#android-specific-qmake-variables
+    # https://doc.qt.io/qt-6.5/deployment-android.html#android-specific-qmake-variables
     ANDROID_PACKAGE_SOURCE_DIR = "$${CAMCOPS_SOURCE_ROOT}/android"
     message("ANDROID_PACKAGE_SOURCE_DIR: $${ANDROID_PACKAGE_SOURCE_DIR}")
     # ... contains things like AndroidManifest.xml
@@ -416,7 +416,7 @@ isEmpty(CAMCOPS_ARCH_TAG) {
 # To have the linker show its working:
 # LIBS += "-Wl,--verbose"
 
-equals(CAMCOPS_QT_LINKAGE, "static") {  # http://doc.qt.io/qt-5/qmake-test-function-reference.html
+equals(CAMCOPS_QT_LINKAGE, "static") {  # https://doc.qt.io/qt-6.5/qmake-test-function-reference.html
     message("Using static linkage from CamCOPS to Qt")
     CONFIG += static
 } else:equals(CAMCOPS_QT_LINKAGE, "dynamic") {

diff --git a/tablet_qt/core/camcopsapp.cpp b/tablet_qt/core/camcopsapp.cpp
@@ -143,7 +143,7 @@ CamcopsApp::CamcopsApp(int& argc, char* argv[]) :
 
 CamcopsApp::~CamcopsApp()
 {
-    // http://doc.qt.io/qt-5.7/objecttrees.html
+    // https://doc.qt.io/qt-6.5/objecttrees.html
     // Only delete things that haven't been assigned a parent
     delete m_network_gui_guard;
     delete m_p_main_window;
@@ -1970,7 +1970,7 @@ void CamcopsApp::closeSubWindow()
     // Ownership is returned to the application, so...
     // - AH, NO. OWNERSHIP IS CONFUSING AND THE DOCS ARE DIFFERENT IN QT 4.8
     //   AND 5.9
-    // - From http://doc.qt.io/qt-4.8/qstackedwidget.html#removeWidget :
+    // - From https://doc.qt.io/qt-6.5/qstackedwidget.html#removeWidget :
     //      Removes widget from the QStackedWidget. i.e., widget is not deleted
     //      but simply removed from the stacked layout, causing it to be hidden.
     //      Note: Ownership of widget reverts to the application.

diff --git a/tablet_qt/db/dbfunc.cpp b/tablet_qt/db/dbfunc.cpp
@@ -200,7 +200,7 @@ bool execQuery(QSqlQuery& query, const QString& sql, const ArgList& args,
     return success;
     // The return value is boolean (success?).
     // Use query.next() to iterate through a result set; see
-    // http://doc.qt.io/qt-4.8/sql-sqlstatements.html
+    // https://doc.qt.io/qt-6.5/sql-sqlstatements.html
 }
 
 

diff --git a/tablet_qt/dbobjects/blob.cpp b/tablet_qt/dbobjects/blob.cpp
@@ -149,7 +149,7 @@ void Blob::makeIndexes()
 
 void Blob::rotateCachedImage(int angle_degrees_clockwise) const
 {
-    // http://doc.qt.io/qt-4.8/qtransform.html#rotate
+    // https://doc.qt.io/qt-6.5/qtransform.html#rotate
     angle_degrees_clockwise %= 360;
     if (angle_degrees_clockwise == 0 || m_image.isNull()) {
         return;

diff --git a/tablet_qt/dialogs/progressbox.h b/tablet_qt/dialogs/progressbox.h
@@ -23,7 +23,7 @@
 
 
 // Prototypical use: modal, as per
-// http://doc.qt.io/qt-5.7/qprogressdialog.html#details
+// https://doc.qt.io/qt-6.5/qprogressdialog.html#details
 
 class ProgressBox : public QProgressDialog
 {

diff --git a/tablet_qt/dialogs/scrollmessagebox.cpp b/tablet_qt/dialogs/scrollmessagebox.cpp
@@ -141,7 +141,7 @@ void ScrollMessageBox::addButton(QAbstractButton* button,
 {
     m_button_box->addButton(button, role);
     // The button box TAKES OWNERSHIP:
-    // http://doc.qt.io/qt-4.8/qdialogbuttonbox.html#addButton
+    // https://doc.qt.io/qt-6.5/qdialogbuttonbox.html#addButton
     update();
 }
 
@@ -243,8 +243,8 @@ QDialogButtonBox::ButtonRole ScrollMessageBox::forceEnumMD(
         const QMessageBox::ButtonRole role)
 {
     // They are numerically identical:
-    // - http://doc.qt.io/qt-4.8/qdialogbuttonbox.html#ButtonRole-enum
-    // - http://doc.qt.io/qt-4.8/qmessagebox.html#ButtonRole-enum
+    // - https://doc.qt.io/qt-6.5/qdialogbuttonbox.html#ButtonRole-enum
+    // - https://doc.qt.io/qt-6.5/qmessagebox.html#ButtonRole-enum
     return static_cast<QDialogButtonBox::ButtonRole>(role);
 }
 

diff --git a/tablet_qt/graphics/geometry.h b/tablet_qt/graphics/geometry.h
@@ -47,20 +47,20 @@ The Qt coordinate system
 - Positive x is to the right.
 - Positive y is DOWN. (This matches commonplace screen coordinates; the origin
   is at the top left.)
-  http://doc.qt.io/qt-5.8/coordsys.html
+  https://doc.qt.io/qt-6.5/coordsys.html
 
 - When you rotate a coordinate system, rotation angles are CLOCKWISE.
-  http://doc.qt.io/qt-5.8/qpainter.html#rotate
+  https://doc.qt.io/qt-6.5/qpainter.html#rotate
   ... so for a point (x=1, y=0), positive rotation moves it in the direction of
   INCREASING y.
 
 - But when you draw a pie, rotation angles are ANTICLOCKWISE, and zero degrees
   is in the 3 o'clock position.
-  http://doc.qt.io/qt-5.8/qpainter.html#drawPie
+  https://doc.qt.io/qt-6.5/qpainter.html#drawPie
 
 - Other ANTICLOCKWISE bits:
   - QTranform::rotate
-    http://doc.qt.io/qt-5.8/qtransform.html#rotate
+    https://doc.qt.io/qt-6.5/qtransform.html#rotate
 
 - Qt also uses a "positive ANTICLOCKWISE" system for its graphs, though that's
   more obvious as it's mimicking standard graph geometry here.

diff --git a/tablet_qt/layouts/flowlayouthfw.cpp b/tablet_qt/layouts/flowlayouthfw.cpp
@@ -98,7 +98,7 @@ FlowLayoutHfw::FlowLayoutHfw(const int margin,
 FlowLayoutHfw::~FlowLayoutHfw()
 {
     // RNC: crash here relating to double deletion.
-    // - From http://doc.qt.io/qt-4.8/layout.html :
+    // - From https://doc.qt.io/qt-6.5/layout.html :
     //   "Note: Widgets in a layout are children of the widget on which the
     //   layout is installed, not of the layout itself. Widgets can only have
     //   other widgets as parent, not layouts."

diff --git a/tablet_qt/lib/css.cpp b/tablet_qt/lib/css.cpp
@@ -56,7 +56,7 @@ QString colourCss(const QColor& colour)
 
 QString penStyleCss(const QPen& pen)
 {
-    // http://doc.qt.io/qt-4.8/qpen.html#pen-style
+    // https://doc.qt.io/qt-6.5/qpen.html#pen-style
     // https://www.w3schools.com/cssref/pr_border-style.asp
     switch (pen.style()) {
     case Qt::NoPen:

diff --git a/tablet_qt/lib/errorfunc.cpp b/tablet_qt/lib/errorfunc.cpp
@@ -26,7 +26,7 @@ void fatalError(const QString& error)
 {
     const QString msg = "ABORTING: " + error;
     // qFatal() will kill the app
-    // http://doc.qt.io/qt-4.8/qtglobal.html#qFatal
+    // https://doc.qt.io/qt-6.5/qtglobal.html#qFatal
     // If the first argument is not a string literal:
     // "format not a string literal and no format arguments"
     // https://bugreports.qt.io/browse/QTBUG-8967

diff --git a/tablet_qt/lib/idpolicy.cpp b/tablet_qt/lib/idpolicy.cpp
@@ -20,7 +20,7 @@
 
 #include "idpolicy.h"
 #include <QObject>
-#include <QRegularExpression>  // replacing QRegExp; http://doc.qt.io/qt-5.7/qregexp.html#details
+#include <QRegularExpression>  // replacing QRegExp; https://doc.qt.io/qt-6.5/qregexp.html#details
 #include "common/dbconst.h"
 #include "common/design_defines.h"
 #include "common/preprocessor_aid.h"

diff --git a/tablet_qt/lib/uifunc.cpp b/tablet_qt/lib/uifunc.cpp
@@ -438,7 +438,7 @@ QString textCSS(const int fontsize_pt,
         css += QString("font-size: %1pt;").arg(fontsize_pt);
     }
     // Only pt and px supported
-    // http://doc.qt.io/qt-5.7/stylesheet-reference.html
+    // https://doc.qt.io/qt-6.5/stylesheet-reference.html
     if (bold) {
         css += "font-weight: bold;";
     }

diff --git a/tablet_qt/menu/testmenu.cpp b/tablet_qt/menu/testmenu.cpp
@@ -317,7 +317,7 @@ void TestMenu::doneSeeConsole()
 void TestMenu::testProgress()
 {
     qDebug() << Q_FUNC_INFO << "start";
-    // http://doc.qt.io/qt-4.8/qprogressdialog.html#details
+    // https://doc.qt.io/qt-6.5/qprogressdialog.html#details
     // http://stackoverflow.com/questions/3752742/how-do-i-create-a-pause-wait-function-using-qt
     const int num_things = 100;
     QProgressDialog progress(

diff --git a/tablet_qt/notes/compilation_android.txt b/tablet_qt/notes/compilation_android.txt
@@ -37,7 +37,7 @@ A. Rebuild Qt and everything else. Error has gone away.
 Q. Plugin class name could not be determined for plugin 'qtforandroid'
    ... or other similar errors under Linux
    ... which relate to building Qt statically
-   See http://doc.qt.io/qt-5/plugins-howto.html#static-plugins
+   See https://doc.qt.io/qt-6.5/plugins-howto.html#static-plugins
    https://bugreports.qt.io/browse/QTBUG-32618
    ... fixed? Unresolved?
 
@@ -171,7 +171,7 @@ Q. [from androiddeployqt] No platform plugin, neither libqtforandroid.so or
      ... in updateAndroidManifest
      ... based on options.qtDependencies
    - one option might be to use ANDROID_DEPLOYMENT_DEPENDENCIES and take full
-     manual control; http://doc.qt.io/qt-5/deployment-android.html
+     manual control; https://doc.qt.io/qt-6.5/deployment-android.html
 
 So is the answer that Android build should be DYNAMIC?
 "Dynamic" here still means that the Qt libraries are bundled into an APK, so

diff --git a/tablet_qt/notes/compilation_linux.txt b/tablet_qt/notes/compilation_linux.txt
@@ -16,7 +16,7 @@ sudo apt install \
 
 SEE ALSO THE END OF build_qt.py
 
-[1] http://doc.qt.io/qt-5/linux.html#requirements-for-development-host
+[1] https://doc.qt.io/qt-6.5/linux.html#requirements-for-development-host
 [2] probably: https://wiki.qt.io/QtWayland#Desktop_build_instructions
 [3] qtimageformats/src/plugins/imageformats/webp/webp.pro
 [4] see build_qt.py
@@ -230,7 +230,7 @@ A.  You are building with an edition of Qt configured with "-system-xcb" rather
     than "-qt-xcb". (Possibly because "-qt-xcb" seems to be buggy under Qt
     5.1.0; see https://bugreports.qt.io/browse/QTBUG-64928 .)
 
-    See http://doc.qt.io/qt-5/linux-requirements.html and run
+    See https://doc.qt.io/qt-6.5/linux-requirements.html and run
 
     sudo apt install \
         libfontconfig1-dev \

diff --git a/tablet_qt/notes/database_performance.txt b/tablet_qt/notes/database_performance.txt
@@ -39,7 +39,7 @@ NOTES
   - https://github.com/sqlcipher/sqlcipher/issues/67
 
 - In Qt, you MUST use a new connection for each thread.
-  http://doc.qt.io/qt-5/threads-modules.html#threads-and-the-sql-module
+  https://doc.qt.io/qt-6.5/threads-modules.html#threads-and-the-sql-module
 
 - Differentiating a read query from a write query:
 
@@ -190,4 +190,4 @@ Then, for >1 database:
 
 See also:
     https://woboq.com/blog/introduction-to-lockfree-programming.html
-    http://doc.qt.io/qt-5/qtcore-threads-waitconditions-example.html
+    https://doc.qt.io/qt-6.5/qtcore-threads-waitconditions-example.html
diff --git a/tablet_qt/notes/layout_notes.txt b/tablet_qt/notes/layout_notes.txt
@@ -434,7 +434,7 @@ for the following layouts:
 - GridLayoutHfw -- replacements for QGridLayout.
 
 - FlowLayoutHfw -- replacement for Qt's FlowLayout
-  (http://doc.qt.io/qt-5/qtwidgets-layouts-flowlayout-example.html).
+  (https://doc.qt.io/qt-6.5/qtwidgets-layouts-flowlayout-example.html).
 
 and the following widgets:
 

diff --git a/tablet_qt/notes/overall_design.txt b/tablet_qt/notes/overall_design.txt
@@ -14,7 +14,7 @@ CLIENT ARCHITECTURE
   run even these over the web; e.g. Qt applications are starting [2017] to
   support being served over VNC [*]).
 
-    [*] http://doc.qt.io/qt-4.8/qt-embedded-vnc.html
+    [*] https://doc.qt.io/qt-6.5/qt-embedded-vnc.html
         https://raspberrypi.stackexchange.com/questions/23221/running-a-qt5-application-not-full-screen-use-vnc
         https://stackoverflow.com/questions/24517954/running-a-qt-app-over-the-web
         https://stackoverflow.com/questions/3240633/web-based-vnc-client