[poppler] 2 commits - .gitlab-ci.yml qt6/demos

[GitLab Mirror]

 .gitlab-ci.yml       |    8 ++++----
 qt6/demos/viewer.cpp |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 636d12b0f403d462af3652e4ebfd62d9fc7c58a8
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Sep 18 01:26:40 2020 +0200

    Fix compilation with new Qt6 snaptshot

diff --git a/qt6/demos/viewer.cpp b/qt6/demos/viewer.cpp
index ff850d62..73410611 100644
--- a/qt6/demos/viewer.cpp
+++ b/qt6/demos/viewer.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2008-2009, Pino Toscano <pino at kde.org>
- * Copyright (C) 2008, 2019, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, 2019, 2020, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2009, Shawn Rutledge <shawn.t.rutledge at gmail.com>
  * Copyright (C) 2013, Fabio D'Urso <fabiodurso at hotmail.it>
  *
@@ -51,14 +51,14 @@ PdfViewer::PdfViewer(QWidget *parent) : QMainWindow(parent), m_currentPage(0), m
     // setup the menus
     QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
     m_fileOpenAct = fileMenu->addAction(tr("&Open"), this, &PdfViewer::slotOpenFile);
-    m_fileOpenAct->setShortcut(Qt::CTRL + Qt::Key_O);
+    m_fileOpenAct->setShortcut(Qt::CTRL | Qt::Key_O);
     fileMenu->addSeparator();
     m_fileSaveCopyAct = fileMenu->addAction(tr("&Save a Copy..."), this, &PdfViewer::slotSaveCopy);
-    m_fileSaveCopyAct->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_S);
+    m_fileSaveCopyAct->setShortcut(Qt::CTRL | Qt::SHIFT | Qt::Key_S);
     m_fileSaveCopyAct->setEnabled(false);
     fileMenu->addSeparator();
     QAction *act = fileMenu->addAction(tr("&Quit"), qApp, &QApplication::closeAllWindows);
-    act->setShortcut(Qt::CTRL + Qt::Key_Q);
+    act->setShortcut(Qt::CTRL | Qt::Key_Q);
 
     QMenu *viewMenu = menuBar()->addMenu(tr("&View"));
 
commit 8fd2a2781e3aaf798a4c28f450d778b57ae2b0b8
Author: Albert Astals Cid <aacid at kde.org>
Date:   Fri Sep 18 00:54:36 2020 +0200

    CI: Update qt6 url again

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 89bb6bbc..211d40dc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,10 +38,10 @@ clang_format:
 build:
   stage: build
   script:
-    - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009070614qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-    - 7z x 6.0.0-0-202009070614qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
-    - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009070614icu-linux-Rhel7.2-x64.7z
-    - 7z x 6.0.0-0-202009070614icu-linux-Rhel7.2-x64.7z
+    - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009171622qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+    - 7z x 6.0.0-0-202009171622qtbase-Linux-RHEL_7_6-GCC-Linux-RHEL_7_6-X86_64.7z
+    - wget http://download.qt.io/online/qtsdkrepository/linux_x64/desktop/qt6_600/qt.qt6.600.gcc_64/6.0.0-0-202009171622icu-linux-Rhel7.2-x64.7z
+    - 7z x 6.0.0-0-202009171622icu-linux-Rhel7.2-x64.7z
     - git clone --branch ${CI_COMMIT_REF_NAME} --depth 1 ${TEST_DATA_URL} test-data || git clone --depth 1 ${UPSTREAM_TEST_DATA_URL} test-data
     - mkdir -p build && cd build
     - cmake -G Ninja -DTESTDATADIR=$PWD/../test-data .. -DCMAKE_PREFIX_PATH=$PWD/../6.0.0/gcc_64/lib/cmake