diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-03-21 00:58:44 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-03-21 00:58:44 +0100 |
| commit | 369af896bc3c602ccce0a56ede95271959d08fc3 (patch) | |
| tree | e237b92946b6a56ea06f89059fc73fa1fd5396f7 | |
| parent | b100aea6c2e36bb43de2929bde4e9fdf96800edc (diff) | |
| download | kmymoney-369af896.tar.gz kmymoney-369af896.zip | |
Fix TQT_NO_STL × QT_NO_STL to resolve FTBFS in stable branch,
which comes from commit 5ec229a4470f605eca53326853ff246a49e80189.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp | 14 | ||||
| -rw-r--r-- | 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 |