Fix TQT_NO_STL × QT_NO_STL to resolve FTBFS in stable branch,

which comes from commit 5ec229a447.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
r14.0.x
Slávek Banko 3 years ago
parent b100aea6c2
commit 369af896bc
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -16,9 +16,9 @@
***************************************************************************/ ***************************************************************************/
// force to use TQt with STL // force to use TQt with STL
#if defined(TQT_NO_STL) #if defined(QT_NO_STL)
# define DISABLE_TQT_NO_STL # define DISABLE_QT_NO_STL
# undef TQT_NO_STL # undef QT_NO_STL
#endif #endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -1890,8 +1890,8 @@ void MyMoneyDatabaseMgr::removeReferences(const TQString& id)
#undef CATCH #undef CATCH
#undef PASS #undef PASS
// restore TQT_NO_STL // restore QT_NO_STL
#if defined(DISABLE_TQT_NO_STL) #if defined(DISABLE_QT_NO_STL)
# undef DISABLE_TQT_NO_STL # undef DISABLE_QT_NO_STL
# define TQT_NO_STL # define QT_NO_STL
#endif #endif

@ -17,9 +17,9 @@
***************************************************************************/ ***************************************************************************/
// force to use TQt with STL // force to use TQt with STL
#if defined(TQT_NO_STL) #if defined(QT_NO_STL)
# define DISABLE_TQT_NO_STL # define DISABLE_QT_NO_STL
# undef TQT_NO_STL # undef QT_NO_STL
#endif #endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
@ -4510,8 +4510,8 @@ const TQString MyMoneyDbDatetimeColumn::generateDDL (databaseTypeE dbType) const
return qs; return qs;
} }
// restore TQT_NO_STL // restore QT_NO_STL
#if defined(DISABLE_TQT_NO_STL) #if defined(DISABLE_QT_NO_STL)
# undef DISABLE_TQT_NO_STL # undef DISABLE_QT_NO_STL
# define TQT_NO_STL # define QT_NO_STL
#endif #endif

Loading…
Cancel
Save