projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
486601f
)
Make QUuid compile with QT_NO_QUUID_STRING
author
Jeremy Katz
<jeremy.katz@nokia.com>
Mon, 18 Jun 2012 15:06:13 +0000
(17:06 +0200)
committer
Qt by Nokia
<qt-info@nokia.com>
Mon, 18 Jun 2012 17:15:54 +0000
(19:15 +0200)
Task-number: QTBUG-24816
Change-Id: I0cbb0581a1c3abefdde75b7cd45fdafd31640f0d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
src/corelib/plugin/quuid.cpp
patch
|
blob
|
history
diff --git
a/src/corelib/plugin/quuid.cpp
b/src/corelib/plugin/quuid.cpp
index
b1805af
..
facd180
100644
(file)
--- a/
src/corelib/plugin/quuid.cpp
+++ b/
src/corelib/plugin/quuid.cpp
@@
-986,7
+986,7
@@
QUuid QUuid::createUuid()
guid; otherwise returns false.
*/
-#if
ndef QT_NO_DEBUG_STREAM
+#if
!defined(QT_NO_DEBUG_STREAM) && !defined(QT_NO_QUUID_STRING)
QDebug operator<<(QDebug dbg, const QUuid &id)
{
dbg.nospace() << "QUuid(" << id.toString() << ')';