Merge branch 'cutefishos:main' into main

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+name: Build
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  debian:
+    name: Debian
+    runs-on: ubuntu-latest
+    container: docker.io/library/debian:sid
+    steps:
+    - name: Checkout Source
+      uses: actions/checkout@v2
+    - name: Update repository
+      run: apt-get update -y
+    - name: Install the basic dev packages
+      run: apt-get install -y equivs curl git devscripts lintian build-essential automake autotools-dev cmake g++
+    - name: Install build dependencies
+      run: mk-build-deps -i -t "apt-get --yes" -r
+    - name: Build Package
+      run: dpkg-buildpackage -b -uc -us -j$(nproc)
+
+  ubuntu:
+    name: Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout Source
+      uses: actions/checkout@v2
+    - name: Update repository
+      run: sudo apt-get update -y
+    - name: Install the basic dev packages
+      run: sudo apt-get install -y equivs curl git devscripts lintian build-essential automake autotools-dev cmake g++
+    - name: Install build dependencies
+      run: sudo mk-build-deps -i -t "apt-get --yes" -r
+    - name: Build Package
+      run: dpkg-buildpackage -b -uc -us -j$(nproc)

qmltermwidget/lib/ProcessInfo.cpp

@@ -442,7 +442,11 @@ private:
                     uidLine = statusLine;
             } while (!statusLine.isNull() && uidLine.isNull());
 
-            uidStrings << uidLine.split('\t', Qt::SkipEmptyParts);
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+      uidStrings << uidLine.split('\t', QString::SkipEmptyParts);
+#else
+      uidStrings << uidLine.split('\t', Qt::SkipEmptyParts);
+#endif
             // Must be 5 entries: 'Uid: %d %d %d %d' and
             // uid string must be less than 5 chars (uint)
             if (uidStrings.size() == 5)

qmltermwidget/lib/TerminalDisplay.cpp

@@ -2447,7 +2447,12 @@ void TerminalDisplay::wheelEvent( QWheelEvent* ev )
         // terminal program wants notification of mouse activity
         int charLine;
         int charColumn;
-        getCharacterPosition(ev->position().toPoint() , charLine , charColumn);
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0)
+        getCharacterPosition(ev->pos(), charLine, charColumn);
+#else
+        getCharacterPosition(ev->position().toPoint(), charLine, charColumn);
+#endif
 
         emit mouseSignal(ev->angleDelta().y() > 0 ? 4 : 5,
                          charColumn + 1,

qmltermwidget/lib/kpty.cpp

@@ -331,7 +331,12 @@ gotpty:
             !d->chownpty(true)) {
         qWarning()
         << "chownpty failed for device " << ptyName << "::" << d->ttyName
-        << "\nThis means the communication can be eavesdropped." << Qt::endl;
+        << "\nThis means the communication can be eavesdropped."
+#if QT_VERSION >= 0x050e00
+        << Qt::endl;
+#else
+        << endl;
+#endif
     }
 
 #if defined (HAVE__GETPTY) || defined (HAVE_GRANTPT)