diff options
author | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
---|---|---|
committer | CyberLeo <cyberleo@cyberleo.net> | 2021-07-22 21:02:46 -0500 |
commit | 59068642667b2748b2f24d18c58b1d2fdfed7619 (patch) | |
tree | deca4d721637676253ed1270f252f8d389286151 /user/qt5-qtbase/forward-port-move.patch | |
parent | 4a177049e3d486da3f54d346d63ea80699c08b5b (diff) | |
parent | 50e523c03bbcb6be1298e3dedb0441b7e47ab2eb (diff) | |
download | packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.gz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.bz2 packages-59068642667b2748b2f24d18c58b1d2fdfed7619.tar.xz packages-59068642667b2748b2f24d18c58b1d2fdfed7619.zip |
Merge branch 'master' into kpartx
Diffstat (limited to 'user/qt5-qtbase/forward-port-move.patch')
-rw-r--r-- | user/qt5-qtbase/forward-port-move.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/user/qt5-qtbase/forward-port-move.patch b/user/qt5-qtbase/forward-port-move.patch new file mode 100644 index 000000000..cc30ea6e1 --- /dev/null +++ b/user/qt5-qtbase/forward-port-move.patch @@ -0,0 +1,20 @@ +At least Akonadi uses this from 5.13.0. We can use LTS Qt by backporting these +simple macros. + +--- qtbase-everywhere-src-5.12.9/src/corelib/global/qglobal.h.old 2020-06-03 10:51:20.000000000 +0000 ++++ qtbase-everywhere-src-5.12.9/src/corelib/global/qglobal.h 2020-09-17 16:01:53.181072159 +0000 +@@ -372,6 +372,14 @@ + Class(const Class &) Q_DECL_EQ_DELETE;\ + Class &operator=(const Class &) Q_DECL_EQ_DELETE; + ++#define Q_DISABLE_MOVE(Class) \ ++ Class(Class &&) = delete; \ ++ Class &operator=(Class &&) = delete; ++ ++#define Q_DISABLE_COPY_MOVE(Class) \ ++ Q_DISABLE_COPY(Class) \ ++ Q_DISABLE_MOVE(Class) ++ + /* + No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols + for Qt's internal unit tests. If you want slower loading times and more |