whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make QUuid compile with QT_NO_QUUID_STRING without breaking QDebug << 

Change I0cbb0581a1c3abefdde75b7cd45fdafd31640f0d breaks the use of
operator<< for QDebug, which shows up when trying to link QtCore in
the small qconfig.

Instead, render QUuid as "QUuid(QT_NO_QUUID_STRING)".

Task-number: QTBUG-24816

Change-Id: Ia52283d7461a9907bcec7a110e41c9f830895efe
Reviewed-by: Tasuku Suzuki <tasuku.suzuki@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
bb10
Jeremy Katz 2012-06-19 00:18:09 +02:00 committed by Qt by Nokia
parent 23e3c703a1
commit a8cbd3a527
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/plugin/quuid.cpp
View File

@ -986,10 +986,15 @@ QUuid QUuid::createUuid()
guid; otherwise returns false.
*/
#if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_NO_QUUID_STRING)
#ifndef QT_NO_DEBUG_STREAM
QDebug operator<<(QDebug dbg, const QUuid &id)
{
#ifndef QT_NO_QUUID_STRING
dbg.nospace() << "QUuid(" << id.toString() << ')';
#else
Q_UNUSED(id)
dbg.nospace() << "QUuid(QT_NO_QUUID_STRING)";
#endif
return dbg.space();
}
#endif