diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-05-10 14:40:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-10 18:02:29 +0200 |
| commit | 00373840db3089b58896d083f35007ab072387ee (patch) | |
| tree | 5b95c2c2b6cf40b7b6e43fa7a05a47dab928b2d9 /src/tools | |
| parent | 39b4e528e1032992f20feb2c4ac85308738efd76 (diff) | |
Remove the HAVE_DECLARATIVE define.
It is unconditionally defined.
Change-Id: I8961805eab984dd7331b7ce3dc228a031193892b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdoc/main.cpp | 6 | ||||
| -rw-r--r-- | src/tools/qdoc/qdoc.pro | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index 742075ca1e..9d5dbbd352 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -58,11 +58,9 @@ #include "tokenizer.h" #include "tree.h" -#ifdef HAVE_DECLARATIVE #include "jscodemarker.h" #include "qmlcodemarker.h" #include "qmlcodeparser.h" -#endif #include <qdatetime.h> #include <qdebug.h> @@ -428,9 +426,7 @@ int main(int argc, char **argv) and create a tree for C++. */ CppCodeParser cppParser; -#ifdef HAVE_DECLARATIVE QmlCodeParser qmlParser; -#endif PureDocParser docParser; /* @@ -439,10 +435,8 @@ int main(int argc, char **argv) */ PlainCodeMarker plainMarker; CppCodeMarker cppMarker; -#ifdef HAVE_DECLARATIVE JsCodeMarker jsMarker; QmlCodeMarker qmlMarker; -#endif HtmlGenerator htmlGenerator; DitaXmlGenerator ditaxmlGenerator; diff --git a/src/tools/qdoc/qdoc.pro b/src/tools/qdoc/qdoc.pro index 1e570583f5..348593d74a 100644 --- a/src/tools/qdoc/qdoc.pro +++ b/src/tools/qdoc/qdoc.pro @@ -77,7 +77,6 @@ SOURCES += atom.cpp \ ### QML/JS Parser ### -DEFINES += HAVE_DECLARATIVE include(qmlparser/qmlparser.pri) HEADERS += jscodemarker.h \ |