Merge qmljshighlighter.* with qmlhighlighter.*.

2010-02-15 12:27:25 +01:00
parent 3d34ce42f7
commit 8fb82ef792
9 changed files with 170 additions and 253 deletions
--- a/src/libs/qmljs/qmljs-lib.pri
+++ b/src/libs/qmljs/qmljs-lib.pri
@@ -6,8 +6,6 @@ contains(CONFIG, dll) {

 include(parser/parser.pri)

-DEFINES += QSCRIPTHIGHLIGHTER_BUILD_LIB
-
 DEPENDPATH += $$PWD
 INCLUDEPATH += $$PWD/..

@@ -36,6 +34,6 @@ contains(QT_CONFIG, declarative) {
 }

 contains(QT, gui) {
-    SOURCES += $$PWD/qmljshighlighter.cpp $$PWD/qmljsindenter.cpp
-    HEADERS += $$PWD/qmljshighlighter.h $$PWD/qmljsindenter.h
+    SOURCES += $$PWD/qmljsindenter.cpp
+    HEADERS += $$PWD/qmljsindenter.h
 }