Port deprecated Qt enum (#72)

* ci: turn on -Wall with qmake * porting: from deprecated QPalette::Background
fhackenberger · Apr 27, 2024 · af6b3f6 · af6b3f6
1 parent 5696d92
commit af6b3f6
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
       - name: Build QTikZ
         run: |
           mkdir -p build-qt5-ubuntu && cd build-qt5-ubuntu
-          QT_SELECT=5 qmake ../qtikz.pro
+          QT_SELECT=5 qmake -Wall -Wdeprecated ../qtikz.pro
           QT_SELECT=5 make -j4
 
   linux-kde:

diff --git a/app/logtextedit.cpp b/app/logtextedit.cpp
@@ -64,7 +64,7 @@ void LogTextEdit::setLogPalette(bool runFailed)
     moveCursor(QTextCursor::End);
     if (runFailed) {
         QPalette failedPalette(QApplication::palette());
-        failedPalette.setColor(QPalette::Background, QColor(255, 102, 102));
+        failedPalette.setColor(QPalette::Window, QColor(255, 102, 102));
         setAutoFillBackground(true);
         setPalette(failedPalette);
     } else

diff --git a/qtikz.pro b/qtikz.pro
@@ -7,6 +7,10 @@ APPNAME = qtikz
 APPEXENAME = qtikz
 APPVERSION = 0.13.2
 
+QMAKE_CXXFLAGS += $$(CXXFLAGS)
+QMAKE_CFLAGS += $$(CFLAGS)
+QMAKE_LFLAGS += $$(LDFLAGS)
+
 include(qmake/qtikzconfig.pri)
 include(qmake/qtikzdefaults.pri)
 include(qmake/qtikzmacros.pri)