Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ doc/build
*.qm
qscintilla_*.ts
*.rc

_build
1 change: 1 addition & 0 deletions src/gui/AboutDialogs.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <util/ComposerSettings.h>
using namespace cpr::core;

#include <QAction>
#include <QDialog>
#include <QStringListModel>
#include <QTreeWidget>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.2)
project(qscintilla2_telem)

set (CMAKE_AUTOMOC ON)
set (CMAKE_AUTOMOC OFF)
set (CMAKE_AUTORCC ON)
set (CMAKE_INCLUDE_CURRENT_DIR ON)

Expand All @@ -23,15 +23,15 @@ set (QSCINTILLA_SOURCES
./Qsci/qscicommandset.h
./Qsci/qscidocument.h
./Qsci/qscilexer.h

./Qsci/qscilexercustom.h
./Qsci/qscilexercpp.h
./Qsci/qscilexerpython.h
./Qsci/qscilexerjavascript.h
./Qsci/qscilexerhtml.h
./Qsci/qscilexerxml.h
./Qsci/qscilexerlua.h

./Qsci/qscimacro.h
./Qsci/qsciprinter.h
./Qsci/qscistyle.h
Expand Down Expand Up @@ -91,7 +91,7 @@ set (QSCINTILLA_SOURCES
../src/UniConversion.h
../src/ViewStyle.h
../src/XPM.h

qsciscintilla.cpp
qsciscintillabase.cpp
qsciabstractapis.cpp
Expand All @@ -100,15 +100,15 @@ set (QSCINTILLA_SOURCES
qscicommandset.cpp
qscidocument.cpp
qscilexer.cpp

qscilexercustom.cpp
qscilexercpp.cpp
qscilexerpython.cpp
qscilexerjavascript.cpp
qscilexerhtml.cpp
qscilexerxml.cpp
qscilexerlua.cpp

qscimacro.cpp
qsciprinter.cpp
qscistyle.cpp
Expand All @@ -119,12 +119,12 @@ set (QSCINTILLA_SOURCES
ListBoxQt.cpp
PlatQt.cpp
ScintillaQt.cpp

../lexers/LexPython.cpp
../lexers/LexCPP.cpp
../lexers/LexHTML.cpp
../lexers/LexLua.cpp

../lexlib/Accessor.cpp
../lexlib/CharacterCategory.cpp
../lexlib/CharacterSet.cpp
Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# The project file for the QScintilla library.
#
# Copyright (c) 2017 Riverbank Computing Limited <info@riverbankcomputing.com>
#
#
# This file is part of QScintilla.
#
#
# This file may be used under the terms of the GNU General Public License
# version 3.0 as published by the Free Software Foundation and appearing in
# the file LICENSE included in the packaging of this file. Please review the
# following information to ensure the GNU General Public License version 3.0
# requirements will be met: http://www.gnu.org/copyleft/gpl.html.
#
#
# If you do not wish to use this file under the terms of the GPL version 3.0
# then you may purchase a commercial license. For more information contact
# info@riverbankcomputing.com.
#
#
# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

Expand Down Expand Up @@ -495,6 +495,7 @@ contains(ALL_LEXERS, true) {
../src/UniConversion.cpp \
../src/ViewStyle.cpp \
../src/XPM.cpp
}

TRANSLATIONS = \
qscintilla_cs.ts \
Expand Down