From 369af896bc3c602ccce0a56ede95271959d08fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Mon, 21 Mar 2022 00:58:44 +0100 Subject: [PATCH] =?UTF-8?q?Fix=20TQT=5FNO=5FSTL=20=C3=97=20QT=5FNO=5FSTL?= =?UTF-8?q?=20to=20resolve=20FTBFS=20in=20stable=20branch,=20which=20comes?= =?UTF-8?q?=20from=20commit=205ec229a4470f605eca53326853ff246a49e80189.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp | 14 +++++++------- kmymoney2/mymoney/storage/mymoneystoragesql.cpp | 14 +++++++------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp index ced8e9a..df6b89e 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp @@ -16,9 +16,9 @@ ***************************************************************************/ // force to use TQt with STL -#if defined(TQT_NO_STL) -# define DISABLE_TQT_NO_STL -# undef TQT_NO_STL +#if defined(QT_NO_STL) +# define DISABLE_QT_NO_STL +# undef QT_NO_STL #endif #ifdef HAVE_CONFIG_H @@ -1890,8 +1890,8 @@ void MyMoneyDatabaseMgr::removeReferences(const TQString& id) #undef CATCH #undef PASS -// restore TQT_NO_STL -#if defined(DISABLE_TQT_NO_STL) -# undef DISABLE_TQT_NO_STL -# define TQT_NO_STL +// restore QT_NO_STL +#if defined(DISABLE_QT_NO_STL) +# undef DISABLE_QT_NO_STL +# define QT_NO_STL #endif diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index 952db4f..b24dbda 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -17,9 +17,9 @@ ***************************************************************************/ // force to use TQt with STL -#if defined(TQT_NO_STL) -# define DISABLE_TQT_NO_STL -# undef TQT_NO_STL +#if defined(QT_NO_STL) +# define DISABLE_QT_NO_STL +# undef QT_NO_STL #endif #ifdef HAVE_CONFIG_H @@ -4510,8 +4510,8 @@ const TQString MyMoneyDbDatetimeColumn::generateDDL (databaseTypeE dbType) const return qs; } -// restore TQT_NO_STL -#if defined(DISABLE_TQT_NO_STL) -# undef DISABLE_TQT_NO_STL -# define TQT_NO_STL +// restore QT_NO_STL +#if defined(DISABLE_QT_NO_STL) +# undef DISABLE_QT_NO_STL +# define QT_NO_STL #endif