diff --git a/src/plugins/qmleditor/qmleditor.pro b/src/plugins/qmleditor/qmleditor.pro
index 14af44fb6693527e7e1d3ce043f95c4ffc4651d3..3ab3c11f92810bfb8517fd8da1e29e9c7b356025 100644
--- a/src/plugins/qmleditor/qmleditor.pro
+++ b/src/plugins/qmleditor/qmleditor.pro
@@ -3,6 +3,10 @@ TARGET = QmlEditor
include(../../qtcreatorplugin.pri)
include(qmleditor_dependencies.pri)
+include(../../shared/qscripthighlighter/qscripthighlighter.pri)
+DEPENDPATH += ../../shared/qscripthighlighter
+
+
CONFIG += help
DEFINES += \
QMLEDITOR_LIBRARY \
diff --git a/src/plugins/qtscripteditor/qtscripteditor.pro b/src/plugins/qtscripteditor/qtscripteditor.pro
index 301bc47b60532a550199778f79b6de276c26f05a..847569bb2221e78b27554035c56090b38116f7db 100644
--- a/src/plugins/qtscripteditor/qtscripteditor.pro
+++ b/src/plugins/qtscripteditor/qtscripteditor.pro
@@ -5,9 +5,9 @@ QT += script
include(../../qtcreatorplugin.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
-include(../../shared/qscripthighlighter/qscripthighlighter.pri)
include(parser/parser.pri)
+include(../../shared/qscripthighlighter/qscripthighlighter.pri)
DEPENDPATH += ../../shared/qscripthighlighter
HEADERS += qtscripteditor.h \
diff --git a/src/shared/qscripthighlighter/qscripthighlighter.h b/src/shared/qscripthighlighter/qscripthighlighter.h
index 082def595508db216b55fc759ea8a2defb0cb242..cc5f9c7dd08c114b774cb2e55f60ce5183900608 100644
--- a/src/shared/qscripthighlighter/qscripthighlighter.h
+++ b/src/shared/qscripthighlighter/qscripthighlighter.h
@@ -30,7 +30,6 @@
#ifndef QSCRIPTSYNTAXHIGHLIGHTER_H
#define QSCRIPTSYNTAXHIGHLIGHTER_H
-#include <qscripthighlighter/qscripthighlighter_global.h>
#include <qscripthighlighter/qscriptincrementalscanner.h>
#include <QtCore/QVector>
@@ -39,7 +38,7 @@
namespace SharedTools {
-class QSCRIPTHIGHLIGHTER_EXPORT QScriptHighlighter : public QSyntaxHighlighter
+class QScriptHighlighter : public QSyntaxHighlighter
{
Q_OBJECT
public:
diff --git a/src/shared/qscripthighlighter/qscripthighlighter.pri b/src/shared/qscripthighlighter/qscripthighlighter.pri
index 0a4112e352adb4fb54a1abe884603526bb425413..97f8917113c702dc0127332f3b0f04bbe934fc06 100644
--- a/src/shared/qscripthighlighter/qscripthighlighter.pri
+++ b/src/shared/qscripthighlighter/qscripthighlighter.pri
@@ -3,7 +3,7 @@ INCLUDEPATH *= $$PWD $$PWD/..
DEFINES += QSCRIPTHIGHLIGHTER_BUILD_LIB
SOURCES += $$PWD/qscriptincrementalscanner.cpp
-HEADERS += $$PWD/qscriptincrementalscanner.h $$PWD/qscripthighlighter_global.h
+HEADERS += $$PWD/qscriptincrementalscanner.h
contains(QT, gui) {
SOURCES += $$PWD/qscripthighlighter.cpp $$PWD/qscriptindenter.cpp
diff --git a/src/shared/qscripthighlighter/qscripthighlighter_global.h b/src/shared/qscripthighlighter/qscripthighlighter_global.h
deleted file mode 100644
index 65dc775bcc08fff09ba900fdf48b2d70088680f5..0000000000000000000000000000000000000000
--- a/src/shared/qscripthighlighter/qscripthighlighter_global.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#ifndef QSCRIPTHIGHLIGHTER_GLOBAL_H
-#define QSCRIPTHIGHLIGHTER_GLOBAL_H
-
-#include <QtCore/QtGlobal>
-
-#ifdef QSCRIPTHIGHLIGHTER_BUILD_LIB
-# define QSCRIPTHIGHLIGHTER_EXPORT Q_DECL_EXPORT
-#else // !QSCRIPTHIGHLIGHTER
-# define QSCRIPTHIGHLIGHTER_EXPORT Q_DECL_IMPORT
-#endif // QSCRIPTHIGHLIGHTER
-
-#endif // QSCRIPTHIGHLIGHTER_GLOBAL_H
diff --git a/src/shared/qscripthighlighter/qscriptincrementalscanner.h b/src/shared/qscripthighlighter/qscriptincrementalscanner.h
index 0c1bd41cae0075c92a62695eb460f191fed1cbb4..403a174a47410b53ccb6b5a48b80d62026f9344f 100644
--- a/src/shared/qscripthighlighter/qscriptincrementalscanner.h
+++ b/src/shared/qscripthighlighter/qscriptincrementalscanner.h
@@ -30,15 +30,13 @@
#ifndef QSCRIPTINCREMENTALSCANNER_H
#define QSCRIPTINCREMENTALSCANNER_H
-#include <qscripthighlighter/qscripthighlighter_global.h>
-
#include <QtCore/QList>
#include <QtCore/QSet>
#include <QtCore/QString>
namespace SharedTools {
-class QSCRIPTHIGHLIGHTER_EXPORT QScriptIncrementalScanner
+class QScriptIncrementalScanner
{
public:
diff --git a/src/shared/qscripthighlighter/qscriptindenter.cpp b/src/shared/qscripthighlighter/qscriptindenter.cpp
index b030c4b6c90c92d051ee1871f989aec39d25fa79..9fa4fdc66e52337ae82e6409dcc1af51317351e4 100644
--- a/src/shared/qscripthighlighter/qscriptindenter.cpp
+++ b/src/shared/qscripthighlighter/qscriptindenter.cpp
@@ -369,7 +369,7 @@ bool QScriptIndenter::readLine()
the first if. The order of the if's is also important.
*/
- if (yyLinizerState.inCComment) {
+ if (yyLinizerState.inComment) {
const QLatin1String slashAster("/*");
k = yyLinizerState.line.indexOf(slashAster);
@@ -377,18 +377,18 @@ bool QScriptIndenter::readLine()
yyLinizerState.line.clear();
} else {
yyLinizerState.line.truncate(k);
- yyLinizerState.inCComment = false;
+ yyLinizerState.inComment = false;
}
}
- if (!yyLinizerState.inCComment) {
+ if (!yyLinizerState.inComment) {
const QLatin1String asterSlash("*/");
k = yyLinizerState.line.indexOf(asterSlash);
if (k != -1) {
for (int i = 0; i < k + 2; i++)
eraseChar(yyLinizerState.line, i, QLatin1Char(' '));
- yyLinizerState.inCComment = true;
+ yyLinizerState.inComment = true;
}
}
@@ -451,7 +451,7 @@ bool QScriptIndenter::readLine()
void QScriptIndenter::startLinizer()
{
yyLinizerState.braceDepth = 0;
- yyLinizerState.inCComment = false;
+ yyLinizerState.inComment = false;
yyLinizerState.pendingRightBrace = false;
yyLine = &yyLinizerState.line;
diff --git a/src/shared/qscripthighlighter/qscriptindenter.h b/src/shared/qscripthighlighter/qscriptindenter.h
index 985387cfb7b158d4c389e484bcef5d19628c6a53..c1517bb604344e4dd8f29bfe97e214d8be7655de 100644
--- a/src/shared/qscripthighlighter/qscriptindenter.h
+++ b/src/shared/qscripthighlighter/qscriptindenter.h
@@ -30,15 +30,13 @@
#ifndef QTSCRIPTINDENTER_H
#define QTSCRIPTINDENTER_H
-#include <qscripthighlighter/qscripthighlighter_global.h>
-
#include <QtCore/QRegExp>
#include <QtCore/QStringList>
#include <QtGui/QTextBlock>
namespace SharedTools {
-class QSCRIPTHIGHLIGHTER_EXPORT QScriptIndenter
+class QScriptIndenter
{
Q_DISABLE_COPY(QScriptIndenter)
@@ -95,13 +93,13 @@ private:
LinizerState()
: braceDepth(0),
leftBraceFollows(false),
- inCComment(false),
+ inComment(false),
pendingRightBrace(false)
{ }
int braceDepth;
bool leftBraceFollows;
- bool inCComment;
+ bool inComment;
bool pendingRightBrace;
QString line;
QTextBlock iter;