Remove the HAVE_DECLARATIVE define.

It is unconditionally defined.

Change-Id: I8961805eab984dd7331b7ce3dc228a031193892b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>

diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp
index 742075c..9d5dbbd 100644 (file)
--- 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 1e57058..348593d 100644 (file)
--- 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 \