Merge branch '1.5'

qxmpp-project · Feb 4, 2024 · b3ae5e2 · b3ae5e2
2 parents 665393b + 8636fb0
commit b3ae5e2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 17 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -22,7 +22,7 @@ jobs:
         include:
           - config: minimal
             qt_version: 6.1.*
-          - config: minimal
+          - config: full-debug
             qt_version: 6.6.*
     steps:
       - name: Install sudo
@@ -32,6 +32,7 @@ jobs:
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_version }}
+          modules: ${{ (startsWith(matrix.qt_version, '6.') && 'qt5compat') || '' }}
           setup-python: true
       - name: Install extra packages
         run: tests/travis/install-build-depends-debian
@@ -52,14 +53,15 @@ jobs:
         config: [minimal, full, full-debug]
         qt_version: ['5.15.*']
         include:
-          - config: minimal
+          - config: full-debug
             qt_version: 6.*.*
     steps:
       - uses: actions/checkout@v2
       - name: Install Qt
         uses: jurplel/install-qt-action@v3
         with:
           version: ${{ matrix.qt_version }}
+          modules: ${{ matrix.qt_version[0] == '6' && 'qt5compat' || '' }}
           setup-python: false
       - name: Install extra packages
         run: tests/travis/install-build-depends-macos
@@ -74,10 +76,18 @@ jobs:
 
   windows:
     runs-on: windows-latest
+    env:
+      QT_VERSION: ${{ matrix.qt_version }}
+    strategy:
+      fail-fast: false
+      matrix:
+        qt_version: ['5.15.*', '6.*.*']
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: ${{ matrix.qt_version }}
       - name: Run tests
         run: |
           ${env:PATH} += ";D:/a/qxmpp/qxmpp/src/Debug"

diff --git a/src/base/QXmppPubSubBaseItem.cpp b/src/base/QXmppPubSubBaseItem.cpp
@@ -60,14 +60,14 @@ QXmppPubSubBaseItem::QXmppPubSubBaseItem(const QString &id, const QString &publi
 }
 
 /// Default copy-constructor
-QXmppPubSubBaseItem::QXmppPubSubBaseItem(const QXmppPubSubBaseItem &iq) = default;
+QXmppPubSubBaseItem::QXmppPubSubBaseItem(const QXmppPubSubBaseItem &iq) noexcept = default;
 /// Default move-constructor
-QXmppPubSubBaseItem::QXmppPubSubBaseItem(QXmppPubSubBaseItem &&) = default;
-QXmppPubSubBaseItem::~QXmppPubSubBaseItem() = default;
+QXmppPubSubBaseItem::QXmppPubSubBaseItem(QXmppPubSubBaseItem &&) noexcept = default;
+QXmppPubSubBaseItem::~QXmppPubSubBaseItem() noexcept = default;
 /// Default assignment operator
-QXmppPubSubBaseItem &QXmppPubSubBaseItem::operator=(const QXmppPubSubBaseItem &iq) = default;
+QXmppPubSubBaseItem &QXmppPubSubBaseItem::operator=(const QXmppPubSubBaseItem &iq) noexcept = default;
 /// Default move-assignment operator
-QXmppPubSubBaseItem &QXmppPubSubBaseItem::operator=(QXmppPubSubBaseItem &&iq) = default;
+QXmppPubSubBaseItem &QXmppPubSubBaseItem::operator=(QXmppPubSubBaseItem &&iq) noexcept = default;
 
 ///
 /// Returns the ID of the PubSub item.

diff --git a/src/base/QXmppPubSubBaseItem.h b/src/base/QXmppPubSubBaseItem.h
@@ -19,12 +19,12 @@ class QXMPP_EXPORT QXmppPubSubBaseItem
 {
 public:
     QXmppPubSubBaseItem(const QString &id = {}, const QString &publisher = {});
-    QXmppPubSubBaseItem(const QXmppPubSubBaseItem &);
-    QXmppPubSubBaseItem(QXmppPubSubBaseItem &&);
-    virtual ~QXmppPubSubBaseItem();
+    QXmppPubSubBaseItem(const QXmppPubSubBaseItem &) noexcept;
+    QXmppPubSubBaseItem(QXmppPubSubBaseItem &&) noexcept;
+    virtual ~QXmppPubSubBaseItem() noexcept;
 
-    QXmppPubSubBaseItem &operator=(const QXmppPubSubBaseItem &);
-    QXmppPubSubBaseItem &operator=(QXmppPubSubBaseItem &&);
+    QXmppPubSubBaseItem &operator=(const QXmppPubSubBaseItem &) noexcept;
+    QXmppPubSubBaseItem &operator=(QXmppPubSubBaseItem &&) noexcept;
 
     QString id() const;
     void setId(const QString &id);

diff --git a/src/base/QXmppPubSubIq_p.h b/src/base/QXmppPubSubIq_p.h
@@ -13,8 +13,9 @@
 #include <QDomElement>
 #include <QSharedDataPointer>
 
+#include "QXmppPubSubBaseItem.h"
+
 class QXmppDataForm;
-class QXmppPubSubBaseItem;
 class QXmppPubSubSubscription;
 class QXmppPubSubAffiliation;
 class QXmppResultSetReply;

diff --git a/tests/travis/install-build-depends-debian b/tests/travis/install-build-depends-debian
@@ -16,16 +16,28 @@ install_cmake() {
     cd
     git clone $URL $NAME
     mkdir -p $NAME-build
-    cmake $NAME -B./$NAME-build/  -DCMAKE_BUILD_TYPE=Release $OPTS
+    cmake $NAME -B./$NAME-build/ -DCMAKE_INSTALL_PREFIX="/usr/local" -DCMAKE_BUILD_TYPE=Release $OPTS
     cmake --build $NAME-build --parallel
     sudo cmake --build $NAME-build --target install
 
     cd $CURRENT_DIR
 }
 
+# Used for QCA cmake options
+case "$QT_VERSION" in
+6*)
+    BUILD_WITH_QT6="ON"
+    ;;
+5*)
+    BUILD_WITH_QT6="OFF"
+    ;;
+esac
+
+# install base tools
 sudo apt-get update -qq
 sudo apt-get install -qq clang cmake git
 
+# install extra dependencies
 case "$CONFIG" in
 full*)
     sudo apt-get install -qq \
@@ -36,6 +48,6 @@ full*)
 
     # Build and install qca and libomemo-c
     install_cmake libomemo-c https://github.com/dino/libomemo-c "-DBUILD_SHARED_LIBS=ON"
-    install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=OFF"
+    install_cmake qca https://invent.kde.org/libraries/qca "-DBUILD_TESTS=OFF -DBUILD_TOOLS=OFF -DBUILD_WITH_QT6=${BUILD_WITH_QT6}"
     ;;
 esac