From bedb5d936b03465f7ba18eff799d279fe69b8a81 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 18 Jan 2010 13:47:47 +0100
Subject: [PATCH] Moved the QScriptHighlighter & friends into the QmlJS
library.
---
src/{shared/qscripthighlighter => libs/qmljs}/README | 0
src/libs/qmljs/qmljs-lib.pri | 1 +
.../qscripthighlighter => libs/qmljs}/qscripthighlighter.cpp | 0
.../qscripthighlighter => libs/qmljs}/qscripthighlighter.h | 0
.../qscripthighlighter => libs/qmljs}/qscripthighlighter.pri | 0
.../qmljs}/qscriptincrementalscanner.cpp | 0
.../qmljs}/qscriptincrementalscanner.h | 0
.../qscripthighlighter => libs/qmljs}/qscriptindenter.cpp | 0
src/{shared/qscripthighlighter => libs/qmljs}/qscriptindenter.h | 0
src/{shared/qscripthighlighter => libs/qmljs}/test/main.cpp | 0
src/{shared/qscripthighlighter => libs/qmljs}/test/test.pro | 0
11 files changed, 1 insertion(+)
rename src/{shared/qscripthighlighter => libs/qmljs}/README (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/qscripthighlighter.cpp (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/qscripthighlighter.h (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/qscripthighlighter.pri (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/qscriptincrementalscanner.cpp (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/qscriptincrementalscanner.h (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/qscriptindenter.cpp (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/qscriptindenter.h (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/test/main.cpp (100%)
rename src/{shared/qscripthighlighter => libs/qmljs}/test/test.pro (100%)
diff --git a/src/shared/qscripthighlighter/README b/src/libs/qmljs/README
similarity index 100%
rename from src/shared/qscripthighlighter/README
rename to src/libs/qmljs/README
diff --git a/src/libs/qmljs/qmljs-lib.pri b/src/libs/qmljs/qmljs-lib.pri
index 01ea6cd0e57..439eb889eb3 100644
--- a/src/libs/qmljs/qmljs-lib.pri
+++ b/src/libs/qmljs/qmljs-lib.pri
@@ -5,6 +5,7 @@ contains(CONFIG, dll) {
}
include(parser/parser.pri)
+include($$PWD/qscripthighlighter.pri)
DEPENDPATH += $$PWD
INCLUDEPATH += $$PWD/..
diff --git a/src/shared/qscripthighlighter/qscripthighlighter.cpp b/src/libs/qmljs/qscripthighlighter.cpp
similarity index 100%
rename from src/shared/qscripthighlighter/qscripthighlighter.cpp
rename to src/libs/qmljs/qscripthighlighter.cpp
diff --git a/src/shared/qscripthighlighter/qscripthighlighter.h b/src/libs/qmljs/qscripthighlighter.h
similarity index 100%
rename from src/shared/qscripthighlighter/qscripthighlighter.h
rename to src/libs/qmljs/qscripthighlighter.h
diff --git a/src/shared/qscripthighlighter/qscripthighlighter.pri b/src/libs/qmljs/qscripthighlighter.pri
similarity index 100%
rename from src/shared/qscripthighlighter/qscripthighlighter.pri
rename to src/libs/qmljs/qscripthighlighter.pri
diff --git a/src/shared/qscripthighlighter/qscriptincrementalscanner.cpp b/src/libs/qmljs/qscriptincrementalscanner.cpp
similarity index 100%
rename from src/shared/qscripthighlighter/qscriptincrementalscanner.cpp
rename to src/libs/qmljs/qscriptincrementalscanner.cpp
diff --git a/src/shared/qscripthighlighter/qscriptincrementalscanner.h b/src/libs/qmljs/qscriptincrementalscanner.h
similarity index 100%
rename from src/shared/qscripthighlighter/qscriptincrementalscanner.h
rename to src/libs/qmljs/qscriptincrementalscanner.h
diff --git a/src/shared/qscripthighlighter/qscriptindenter.cpp b/src/libs/qmljs/qscriptindenter.cpp
similarity index 100%
rename from src/shared/qscripthighlighter/qscriptindenter.cpp
rename to src/libs/qmljs/qscriptindenter.cpp
diff --git a/src/shared/qscripthighlighter/qscriptindenter.h b/src/libs/qmljs/qscriptindenter.h
similarity index 100%
rename from src/shared/qscripthighlighter/qscriptindenter.h
rename to src/libs/qmljs/qscriptindenter.h
diff --git a/src/shared/qscripthighlighter/test/main.cpp b/src/libs/qmljs/test/main.cpp
similarity index 100%
rename from src/shared/qscripthighlighter/test/main.cpp
rename to src/libs/qmljs/test/main.cpp
diff --git a/src/shared/qscripthighlighter/test/test.pro b/src/libs/qmljs/test/test.pro
similarity index 100%
rename from src/shared/qscripthighlighter/test/test.pro
rename to src/libs/qmljs/test/test.pro
--
GitLab