diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-23 14:01:35 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-10-23 14:45:03 +0200 |
commit | 790aef362fd195adf97d8c780a7cbbbade27d51f (patch) | |
tree | 8be464687ab21806cfe9f7ada27098b563aa41b2 /src/tools/qdoc/jscodemarker.h | |
parent | 9720efbd1035c2e939b0581163e6d804c713dd96 (diff) | |
parent | 07475c662eb73c833da2d461b8ef2702ca1e2cfb (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
configure
src/corelib/global/qglobal.h
src/tools/qdoc/node.cpp
src/tools/qdoc/qdocdatabase.cpp
tests/auto/corelib/io/qsettings/tst_qsettings.cpp
tools/configure/configureapp.cpp
Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
Diffstat (limited to 'src/tools/qdoc/jscodemarker.h')
-rw-r--r-- | src/tools/qdoc/jscodemarker.h | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/src/tools/qdoc/jscodemarker.h b/src/tools/qdoc/jscodemarker.h deleted file mode 100644 index ccba2ca4c7..0000000000 --- a/src/tools/qdoc/jscodemarker.h +++ /dev/null @@ -1,69 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the tools applications of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** 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 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* - jscodemarker.h -*/ - -#ifndef JSCODEMARKER_H -#define JSCODEMARKER_H - -#include "qmlcodemarker.h" - -QT_BEGIN_NAMESPACE - -class JsCodeMarker : public QmlCodeMarker -{ - Q_DECLARE_TR_FUNCTIONS(QDoc::JsCodeMarker) - -public: - JsCodeMarker(); - ~JsCodeMarker(); - - virtual bool recognizeCode(const QString &code) Q_DECL_OVERRIDE; - virtual bool recognizeExtension(const QString &ext) Q_DECL_OVERRIDE; - virtual bool recognizeLanguage(const QString &language) Q_DECL_OVERRIDE; - virtual Atom::AtomType atomType() const Q_DECL_OVERRIDE; - - virtual QString markedUpCode(const QString &code, - const Node *relative, - const Location &location) Q_DECL_OVERRIDE; - -private: - QString addMarkUp(const QString &code, const Node *relative, - const Location &location); -}; - -QT_END_NAMESPACE - -#endif |