From 4e807343d7853e4b0565b12477d65034368b6b97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Thu, 29 Aug 2019 14:05:51 +0200 Subject: [PATCH] Apply recent QT => TQT renames to DilOS platform. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- mkspecs/dilos-g++/qmake.conf | 8 ++++---- mkspecs/dilos-g++/qplatformdefs.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/mkspecs/dilos-g++/qmake.conf b/mkspecs/dilos-g++/qmake.conf index 3086f5ec..d7d634eb 100644 --- a/mkspecs/dilos-g++/qmake.conf +++ b/mkspecs/dilos-g++/qmake.conf @@ -41,8 +41,8 @@ QMAKE_INCDIR = QMAKE_LIBDIR = QMAKE_INCDIR_X11 = /usr/include/X11 QMAKE_LIBDIR_X11 = -QMAKE_INCDIR_QT = $(QTDIR)/include -QMAKE_LIBDIR_QT = $(QTDIR)/lib +QMAKE_INCDIR_TQT = $(TQTDIR)/include +QMAKE_LIBDIR_TQT = $(TQTDIR)/lib QMAKE_INCDIR_OPENGL = /usr/include/X11 QMAKE_LIBDIR_OPENGL = @@ -68,8 +68,8 @@ QMAKE_LIBS_OPENGL = -lGLU -lGL -lXmu QMAKE_LIBS_OPENGL_QT = -lGL -lXmu QMAKE_LIBS_THREAD = -lpthread -lrt -QMAKE_MOC = $(QTDIR)/bin/tqmoc -QMAKE_UIC = $(QTDIR)/bin/tquic +QMAKE_MOC = $(TQTDIR)/bin/tqmoc +QMAKE_UIC = $(TQTDIR)/bin/tquic QMAKE_AR = ar cqs QMAKE_RANLIB = diff --git a/mkspecs/dilos-g++/qplatformdefs.h b/mkspecs/dilos-g++/qplatformdefs.h index c27f28d7..f1c2a3d0 100644 --- a/mkspecs/dilos-g++/qplatformdefs.h +++ b/mkspecs/dilos-g++/qplatformdefs.h @@ -47,7 +47,7 @@ #include -#if !defined(QT_NO_COMPAT) +#if !defined(TQT_NO_COMPAT) #define QT_STATBUF struct stat #define QT_STATBUF4TSTAT struct stat #define QT_STAT ::stat