Rework build logic to allow building on amd64

Eeems-Org · Jan 17, 2024 · 0905934 · 0905934
1 parent 6ed9d5e
commit 0905934
Show file tree

Hide file tree

Showing 44 changed files with 132 additions and 103 deletions.
diff --git a/applications/desktop-file-edit/desktop-file-edit.pro b/applications/desktop-file-edit/desktop-file-edit.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         edit.cpp \
         main.cpp

diff --git a/applications/desktop-file-install/desktop-file-install.pro b/applications/desktop-file-install/desktop-file-install.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         ../desktop-file-edit/edit.cpp \
         main.cpp

diff --git a/applications/desktop-file-validate/desktop-file-validate.pro b/applications/desktop-file-validate/desktop-file-validate.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/gio/gio.pro b/applications/gio/gio.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         common.cpp \
         main.cpp

diff --git a/applications/inject_evdev/inject_evdev.pro b/applications/inject_evdev/inject_evdev.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/launcher/controller.h b/applications/launcher/controller.h
@@ -122,7 +122,7 @@ class Controller : public QObject
         networks->setAPI(wifiApi);
         auto state = wifiApi->state();
         m_wifion = state != WifiState::WifiOff && state != WifiState::WifiUnknown;
-        QTimer::singleShot(1000, [=](){
+        QTimer::singleShot(1000, [this](){
             // Get initial values when UI is ready
             batteryLevelChanged(powerApi->batteryLevel());
             batteryStateChanged(powerApi->batteryState());

diff --git a/applications/launcher/launcher.pro b/applications/launcher/launcher.pro
@@ -7,9 +7,6 @@ CONFIG += qml_debug
 CONFIG += qtquickcompiler
 CONFIG += precompile_header
 
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
     main.cpp \
     controller.cpp \

diff --git a/applications/launcher/wifinetworklist.h b/applications/launcher/wifinetworklist.h
@@ -326,7 +326,7 @@ class WifiNetworkList : public QAbstractListModel
         for(auto network : networks){
             network->setAPI(api);
         }
-        connect(api, &Wifi::scanningChanged, this, [=](bool scanning){
+        connect(api, &Wifi::scanningChanged, this, [this](bool scanning){
             emit scanningChanged(scanning);
         });
     }

diff --git a/applications/lockscreen/lockscreen.pro b/applications/lockscreen/lockscreen.pro
@@ -6,9 +6,6 @@ CONFIG += c++11
 CONFIG += qml_debug
 CONFIG += qtquickcompiler
 
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/notify-send/notify-send.pro b/applications/notify-send/notify-send.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/process-manager/controller.h b/applications/process-manager/controller.h
@@ -16,7 +16,15 @@ class Controller : public QObject
     Q_PROPERTY(QString sortBy READ sortBy WRITE sortBy NOTIFY sortByChanged)
 public:
     int protectPid;
-    explicit Controller(QQmlApplicationEngine* engine) : QObject(nullptr), mutex(QMutex::NonRecursive), _engine(engine){
+    explicit Controller(QQmlApplicationEngine* engine)
+    : QObject(nullptr),
+#if QT_DEPRECATED_SINCE(5,15)
+      mutex(QMutex::NonRecursive),
+#else
+      mutex(),
+#endif
+      _engine(engine)
+    {
         m_tasks = new TaskList();
         connect(m_tasks, &TaskList::sortByChanged, this, &Controller::sortByChanged);
         emit tasksChanged(m_tasks);

diff --git a/applications/process-manager/process-manager.pro b/applications/process-manager/process-manager.pro
@@ -3,10 +3,7 @@ QT += dbus
 
 CONFIG += c++11
 CONFIG += qtquickcompiler
-CONFIG += precompile_header
-
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+CONFIG += precompile_header# disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += main.cpp
 

diff --git a/applications/process-manager/tasklist.h b/applications/process-manager/tasklist.h
@@ -69,9 +69,8 @@ class TaskList : public QAbstractListModel
     }
     void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override{
         Q_UNUSED(column)
-        Q_UNUSED(order)
         emit layoutAboutToBeChanged();
-        std::sort(taskItems.begin(), taskItems.end(), [=](TaskItem* a, TaskItem* b) -> bool {
+        std::sort(taskItems.begin(), taskItems.end(), [this, order](TaskItem* a, TaskItem* b) -> bool {
             if(order == Qt::DescendingOrder){
                 auto temp = a;
                 a = b;

diff --git a/applications/screenshot-tool/screenshot-tool.pro b/applications/screenshot-tool/screenshot-tool.pro
@@ -2,10 +2,7 @@ QT -= gui
 QT += dbus
 
 CONFIG += c++11 console
-CONFIG -= app_bundle
-
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+CONFIG -= app_bundle # disables all the APIs deprecated before Qt 6.0.0
 
 SOURCES += \
         main.cpp

diff --git a/applications/screenshot-viewer/controller.h b/applications/screenshot-viewer/controller.h
@@ -5,7 +5,6 @@
 #include <QImage>
 #include <QQuickItem>
 #include <liboxide.h>
-#include <epframebuffer.h>
 
 #include "screenshotlist.h"
 

diff --git a/applications/screenshot-viewer/screenshot-viewer.pro b/applications/screenshot-viewer/screenshot-viewer.pro
@@ -7,9 +7,6 @@ CONFIG += qml_debug
 CONFIG += qtquickcompiler
 CONFIG += precompile_header
 
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/settings-manager/settings-manager.pro b/applications/settings-manager/settings-manager.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/system-service/application.cpp b/applications/system-service/application.cpp
@@ -14,7 +14,6 @@
 #include "screenapi.h"
 #include "buttonhandler.h"
 
-
 using namespace Oxide::Applications;
 
 const event_device touchScreen(deviceSettings.getTouchDevicePath(), O_WRONLY);

diff --git a/applications/system-service/powerapi.h b/applications/system-service/powerapi.h
@@ -16,7 +16,6 @@
 
 class PowerAPI : public APIBase {
     Q_OBJECT
-    Q_CLASSINFO("Version", OXIDE_INTERFACE_VERSION)
     Q_CLASSINFO("D-Bus Interface", OXIDE_POWER_INTERFACE)
     Q_PROPERTY(int state READ state WRITE setState NOTIFY stateChanged)
     Q_PROPERTY(int batteryState READ batteryState NOTIFY batteryStateChanged)

diff --git a/applications/system-service/screenapi.cpp b/applications/system-service/screenapi.cpp
@@ -2,6 +2,8 @@
 #include "notificationapi.h"
 #include "systemapi.h"
 
+#include <liboxide/epaper.h>
+
 QDBusObjectPath ScreenAPI::screenshot(){
     if(!hasPermission("screen")){
         return QDBusObjectPath("/");

diff --git a/applications/system-service/screenapi.h b/applications/system-service/screenapi.h
@@ -12,11 +12,9 @@
 #include <unistd.h>
 #include <sys/mman.h>
 #include <sys/ioctl.h>
-#include <epframebuffer.h>
 #include <liboxide.h>
 
 #include "apibase.h"
-#include "mxcfb.h"
 #include "screenshot.h"
 
 #define DISPLAYWIDTH 1404

diff --git a/applications/system-service/system-service.pro b/applications/system-service/system-service.pro
@@ -6,9 +6,6 @@ CONFIG += console
 CONFIG -= app_bundle
 CONFIG += precompile_header
 
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 QMAKE_CFLAGS += -std=c99
 
 SOURCES += \

diff --git a/applications/system-service/tarnish_stable.h b/applications/system-service/tarnish_stable.h
@@ -1,7 +1,6 @@
 #if defined __cplusplus
 #include <algorithm>
 #include <cstdlib>
-#include <epframebuffer.h>
 #include <ext/stdio_filebuf.h>
 #include <fcntl.h>
 #include <fstream>

diff --git a/applications/system-service/wpa_supplicant.cpp b/applications/system-service/wpa_supplicant.cpp
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -N -p wpa_supplicant.h:wpa_supplicant.cpp fi.w1.wpa_supplicant1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * This file may have been hand-edited. Look for HAND-EDIT comments

diff --git a/applications/system-service/wpa_supplicant.h b/applications/system-service/wpa_supplicant.h
@@ -2,7 +2,7 @@
  * This file was generated by qdbusxml2cpp version 0.8
  * Command line was: qdbusxml2cpp -N -p wpa_supplicant.h:wpa_supplicant.cpp fi.w1.wpa_supplicant1.xml
  *
- * qdbusxml2cpp is Copyright (C) 2020 The Qt Company Ltd.
+ * qdbusxml2cpp is Copyright (C) 2022 The Qt Company Ltd.
  *
  * This is an auto-generated file.
  * Do not edit! All changes made to it will be lost.

diff --git a/applications/task-switcher/controller.h b/applications/task-switcher/controller.h
@@ -7,7 +7,6 @@
 #include <QGuiApplication>
 #include <QScreen>
 
-#include <epframebuffer.h>
 #include <signal.h>
 #include <liboxide.h>
 

diff --git a/applications/task-switcher/corrupt_stable.h b/applications/task-switcher/corrupt_stable.h
@@ -1,6 +1,5 @@
 #if defined __cplusplus
 #include <cstdlib>
-#include <epframebuffer.h>
 #include <fstream>
 #include <iostream>
 #include <liboxide.h>

diff --git a/applications/task-switcher/task-switcher.pro b/applications/task-switcher/task-switcher.pro
@@ -7,9 +7,6 @@ CONFIG += qml_debug
 CONFIG += qtquickcompiler
 CONFIG += precompile_header
 
-DEFINES += QT_DEPRECATED_WARNINGS
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         appitem.cpp \
         main.cpp

diff --git a/applications/update-desktop-database/update-desktop-database.pro b/applications/update-desktop-database/update-desktop-database.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/xdg-desktop-icon/xdg-desktop-icon.pro b/applications/xdg-desktop-icon/xdg-desktop-icon.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/xdg-desktop-menu/xdg-desktop-menu.pro b/applications/xdg-desktop-menu/xdg-desktop-menu.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/xdg-icon-resource/xdg-icon-resource.pro b/applications/xdg-icon-resource/xdg-icon-resource.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/xdg-open/xdg-open.pro b/applications/xdg-open/xdg-open.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/applications/xdg-settings/xdg-settings.pro b/applications/xdg-settings/xdg-settings.pro
@@ -4,9 +4,6 @@ QT += dbus
 CONFIG += c++11 console
 CONFIG -= app_bundle
 
-DEFINES += QT_DEPRECATED_WARNINGS
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
 SOURCES += \
         main.cpp
 

diff --git a/qmake/common.pri b/qmake/common.pri
@@ -1,8 +1,14 @@
 VERSION = 2.8
 
-DEFINES += QT_DEPRECATED_WARNINGS
+!contains(DEFINES, QT_DEPRECATED_WARNINGS){
+    DEFINES += QT_DEPRECATED_WARNINGS
+}
 !contains(DEFINES, QT_DISABLE_DEPRECATED_BEFORE){
-    DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051510
+    isEmpty(QT_DISABLE_DEPRECATED_BEFORE){
+        DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000
+    }else{
+        DEFINES += QT_DISABLE_DEPRECATED_BEFORE=$${QT_DISABLE_DEPRECATED_BEFORE}
+    }
 }
 CONFIG(debug, debug|release){
     LIBS += -lunwind

diff --git a/qmake/epaper.pri b/qmake/epaper.pri
@@ -1,2 +1,5 @@
-LIBS += -L$$OUT_PWD/../../shared/epaper -lqsgepaper
-INCLUDEPATH += $$OUT_PWD/../../shared/epaper
+linux-oe-g++{
+    LIBS += -L$$OUT_PWD/../../shared/epaper -lqsgepaper
+    INCLUDEPATH += $$OUT_PWD/../../shared/epaper
+    DEFINES += EPAPER
+}
diff --git a/qmake/liboxide.pri b/qmake/liboxide.pri
@@ -6,6 +6,7 @@ contains(DEFINES, LIBOXIDE_PRIVATE){
 INCLUDEPATH += $$OUT_PWD/../../shared/liboxide/include
 QT += network
 QT += dbus
+QT += gui
 
 QML_IMPORT_PATH += qrc:/codes.eeems.oxide
 include(sentry.pri)

diff --git a/shared/epaper/epaper.pro b/shared/epaper/epaper.pro
@@ -1,10 +1,15 @@
+!linux-oe-g++{
+    error("epaper is only supported on the reMarkable")
+}
 TEMPLATE = lib
 QT += core
 
 include(../../qmake/common.pri)
 
 VERSION = 1.0
 
+DISTFILES = epframebuffer.h
+
 TARGET = qsgepaper
 target.path = /opt/lib
 INSTALLS += target