aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--PySide/qpytextobject.cpp33
-rw-r--r--doc/pyside.qdocconf.in6
2 files changed, 37 insertions, 2 deletions
diff --git a/PySide/qpytextobject.cpp b/PySide/qpytextobject.cpp
new file mode 100644
index 000000000..90462f5f9
--- /dev/null
+++ b/PySide/qpytextobject.cpp
@@ -0,0 +1,33 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#include "qpytextobject.h"
+
+/*!
+ \class QPyTextObject
+ \brief Workaround to make possible use QTextObjectInterface on PySide.
+ \ingroup richtext-processing
+ Due to the technical details of how to bind C++ classes to Python, you need to use this class when you need to implement
+ your own QTextObjectInterface rather than create a class inheriting from QObject and QTextObjectInterface.
+
+ \sa QTextObjectInterface
+*/
diff --git a/doc/pyside.qdocconf.in b/doc/pyside.qdocconf.in
index 76f46807d..1c8d0e30f 100644
--- a/doc/pyside.qdocconf.in
+++ b/doc/pyside.qdocconf.in
@@ -205,7 +205,8 @@ headerdirs = @QT_SRC_DIR@/src \
@QT_SRC_DIR@/tools/designer/src/lib/sdk \
@QT_SRC_DIR@/tools/designer/src/lib/uilib \
@QT_SRC_DIR@/tools/qtestlib/src \
- @QT_SRC_DIR@/tools/qdbus/src
+ @QT_SRC_DIR@/tools/qdbus/src \
+ @pyside_SOURCE_DIR@
sourcedirs = @QT_SRC_DIR@/src \
@QT_SRC_DIR@/doc/src \
@QT_SRC_DIR@/extensions/activeqt \
@@ -216,7 +217,8 @@ sourcedirs = @QT_SRC_DIR@/src \
@QT_SRC_DIR@/tools/designer/src/lib/sdk \
@QT_SRC_DIR@/tools/designer/src/lib/uilib \
@QT_SRC_DIR@/tools/qtestlib/src \
- @QT_SRC_DIR@/tools/qdbus
+ @QT_SRC_DIR@/tools/qdbus \
+ @pyside_SOURCE_DIR@
excludedirs = @QT_SRC_DIR@/src/3rdparty/clucene \
@QT_SRC_DIR@/src/3rdparty/des \