diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-25 20:57:27 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-25 20:57:27 +0900 |
| commit | 230ed5e400ea4276d927570a7781cfcb5c7a534a (patch) | |
| tree | 56bb72cae9206a3a6734a380f48b85051d054614 /tools | |
| parent | 2df70f03d493f5226821dd2e1da3759e3abceb02 (diff) | |
| download | qt3-230ed5e400ea4276d927570a7781cfcb5c7a534a.tar.gz qt3-230ed5e400ea4276d927570a7781cfcb5c7a534a.zip | |
Always build with a clean namespace
QT_CLEAN_NAMESPACE constant is no more needed
This may theoretically affect applications created for Qt1 and Qt2,
but such applications require further modifications as well.
---------------------------
Cherry picked and adapted from commit ff63338d in tqt3 from Slávek Banko <slavek.banko@axis.cz>
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/msg2qm/msg2qm.cpp | 4 | ||||
| -rw-r--r-- | tools/qvfb/qanimationwriter.cpp | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/msg2qm/msg2qm.cpp b/tools/msg2qm/msg2qm.cpp index 6ac8c36..d90d7b6 100644 --- a/tools/msg2qm/msg2qm.cpp +++ b/tools/msg2qm/msg2qm.cpp @@ -192,10 +192,10 @@ void translate( const QString& filename, const QString& qmfile ) QString charset = msgstr.mid( cpos, i-cpos ); codec = QTextCodec::codecForName( charset.ascii() ); if ( codec ) { - debug( "PO file character set: %s. Codec: %s", + qDebug( "PO file character set: %s. Codec: %s", charset.ascii(), codec->name() ); } else { - debug( "No codec for %s", charset.ascii() ); + qDebug( "No codec for %s", charset.ascii() ); } } break; diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp index ad6a047..161c985 100644 --- a/tools/qvfb/qanimationwriter.cpp +++ b/tools/qvfb/qanimationwriter.cpp @@ -33,7 +33,6 @@ #include "qanimationwriter.h" -#define QT_CLEAN_NAMESPACE #include <qfile.h> #include <png.h> |