diff --git a/core/document.cpp b/core/document.cpp
index 65bce3b1d..8ac83aca4 100644
--- a/core/document.cpp
+++ b/core/document.cpp
@@ -5230,7 +5230,7 @@ QPrinter::Orientation Document::orientation() const
         width = currentPage->width();
         height = currentPage->height();
         if (currentPage->orientation() == Okular::Rotation90 || currentPage->orientation() == Okular::Rotation270) {
-            qSwap(width, height);
+            std::swap(width, height);
         }
         if (width > height) {
             landscape++;
diff --git a/core/generator.cpp b/core/generator.cpp
index 8360bb32b..8af058352 100644
--- a/core/generator.cpp
+++ b/core/generator.cpp
@@ -676,7 +676,7 @@ PixmapRequestPrivate *PixmapRequestPrivate::get(const PixmapRequest *req)
 
 void PixmapRequestPrivate::swap()
 {
-    qSwap(mWidth, mHeight);
+    std::swap(mWidth, mHeight);
 }
 
 class Okular::ExportFormatPrivate : public QSharedData
diff --git a/core/page.cpp b/core/page.cpp
index 00dde949c..5b37f9000 100644
--- a/core/page.cpp
+++ b/core/page.cpp
@@ -391,7 +391,7 @@ void PagePrivate::rotateAt(Rotation orientation)
     deleteTextSelections();
 
     if (((int)m_orientation + (int)m_rotation) % 2 != ((int)m_orientation + (int)orientation) % 2) {
-        qSwap(m_width, m_height);
+        std::swap(m_width, m_height);
     }
 
     Rotation oldRotation = m_rotation;
@@ -451,7 +451,7 @@ void PagePrivate::changeSize(const PageSize &size)
     m_width = size.width();
     m_height = size.height();
     if (m_rotation % 2) {
-        qSwap(m_width, m_height);
+        std::swap(m_width, m_height);
     }
 }
 
diff --git a/core/tilesmanager.cpp b/core/tilesmanager.cpp
index 871cc20af..eb641eafe 100644
--- a/core/tilesmanager.cpp
+++ b/core/tilesmanager.cpp
@@ -201,7 +201,7 @@ void TilesManager::setPixmap(const QPixmap *pixmap, const NormalizedRect &rect,
             int w = width();
             int h = height();
             if (d->rotation % 2) {
-                qSwap(w, h);
+                std::swap(w, h);
                 pixmapSize.transpose();
             }
 
diff --git a/generators/spectre/rendererthread.cpp b/generators/spectre/rendererthread.cpp
index 48b4c8095..0480892b3 100644
--- a/generators/spectre/rendererthread.cpp
+++ b/generators/spectre/rendererthread.cpp
@@ -64,7 +64,7 @@ void GSRendererThread::run()
             int wantedHeight = req.request->height();
 
             if (req.orientation % 2) {
-                qSwap(wantedWidth, wantedHeight);
+                std::swap(wantedWidth, wantedHeight);
             }
 
             spectre_page_render(req.spectrePage, m_renderContext, &data, &row_length);