Hello everybody,
I'm building a kde project that uses the Telepathy-Qt4 library and it
fails to compile because the kde build scripts by default set
-DQT_NO_STL to the compiler flags and tpqt4 has one header-only inline
method that uses the stl compatibility of Qt. The attached patch makes
sure that this method is only exported if QT_NO_STL is not defined.
Since the QList::toStdList() method is also only exported if QT_NO_STL
is not defined, I think checking for the same flag in tpqt4 is the
correct thing to do.
Regards,
George
From 6a545cfe75fa10900e6f8cc88b65628a12a775a1 Mon Sep 17 00:00:00 2001
From: George Kiagiadakis <gkia...@users.sourceforge.net>
Date: Sun, 24 May 2009 16:35:09 +0300
Subject: [PATCH] Export stl compatibility methods only if QT_NO_STL is not defined.
---
TelepathyQt4/referenced-handles.h | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/TelepathyQt4/referenced-handles.h b/TelepathyQt4/referenced-handles.h
index faf094f..36cc700 100644
--- a/TelepathyQt4/referenced-handles.h
+++ b/TelepathyQt4/referenced-handles.h
@@ -48,7 +48,9 @@
#include <TelepathyQt4/Types>
#include <TelepathyQt4/Types>
-#include <list>
+#ifndef QT_NO_STL
+# include <list>
+#endif
#include <QList>
#include <QSet>
@@ -262,10 +264,12 @@ class ReferencedHandles
return toList().toSet();
}
+#ifndef QT_NO_STL
inline std::list<uint> toStdList() const
{
return toList().toStdList();
}
+#endif
inline QVector<uint> toVector() const
{
--
1.6.3.1
_______________________________________________
telepathy mailing list
telepathy@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/telepathy
