diff options
| author | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
|---|---|---|
| committer | Joona Petrell <joona.t.petrell@nokia.com> | 2011-02-22 04:12:05 (GMT) |
| commit | bf9ca539dc4c5efff801856ad9d3f7e14dabad26 (patch) | |
| tree | a5ae494b6e8a2b33f4345f484ba2ead04aca761e /tools/qdoc3/codemarker.cpp | |
| parent | b254be20c03d4dbfc1803cd40dc95d52115b955c (diff) | |
| parent | a34e2ab6f50cc91a4fca5cd7fd7bd22e6495b0c1 (diff) | |
| download | Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.zip Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.gz Qt-bf9ca539dc4c5efff801856ad9d3f7e14dabad26.tar.bz2 | |
Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt into 4.7
Conflicts:
tools/qml/qml.pri
Diffstat (limited to 'tools/qdoc3/codemarker.cpp')
| -rw-r--r-- | tools/qdoc3/codemarker.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/qdoc3/codemarker.cpp b/tools/qdoc3/codemarker.cpp index 15228f4..58642ef 100644 --- a/tools/qdoc3/codemarker.cpp +++ b/tools/qdoc3/codemarker.cpp @@ -40,7 +40,6 @@ ****************************************************************************/ #include <QMetaObject> -#include <QDebug> #include "codemarker.h" #include "config.h" #include "node.h" @@ -60,7 +59,6 @@ QList<CodeMarker *> CodeMarker::markers; been read. */ CodeMarker::CodeMarker() - : slow(false) { markers.prepend(this); } @@ -75,14 +73,11 @@ CodeMarker::~CodeMarker() } /*! - The only thing a code market initializes is its \e{slow} - flag. The \e{slow} flag indicates whether the operations - that slow down qdoc are to be performed or not. It is - turned off by default. + A code market performs no initialization by default. Marker-specific + initialization is performed in subclasses. */ void CodeMarker::initializeMarker(const Config &config) { - slow = config.getBool(QLatin1String(CONFIG_SLOW)); } /*! |