Changeset 1096 for s10k


Ignore:
Timestamp:
Dec 30, 2017, 3:40:33 PM (7 years ago)
Author:
s10k
Message:

Added zlib, quazip, basicxmlsyntaxhighlighter, conditionalsemaphore and linenumberdisplay libraries. zlib and quazip are pre-compiled, but you can compile them yourself, just delete the dll files (or equivalent binary files to your OS)

Location:
s10k/CommonLibs
Files:
652 added
2 edited

Legend:

Unmodified
Added
Removed

  • s10k/CommonLibs/CommonLibs.pri

    r1073 r1096  
    22DEPENDPATH+=$$PWD
    33#include($$PWD/CommonLibs.pro)
    4 
    5 SOURCES += \
    6     $$PWD/pugixml/pugixml.cpp \
    7 
    8 contains(QT, gui){
    9 SOURCES += \
    10     $$PWD/jsonhighlighter/highlighter.cpp \
    11     $$PWD/CustomTreeWidget/customtreewidget.cpp
    12 }
    134
    145HEADERS  += \
    … …  
    167    $$PWD/cpp17optional/optional.hpp \
    178    $$PWD/plog/Log.h \
    18     $$PWD/pugixml/pugixml.hpp
     9    $$PWD/pugixml/pugixml.hpp \
     10        $$PWD/ConditionalSemaphore/conditionalsemaphore.h
     11
     12SOURCES += \
     13    $$PWD/pugixml/pugixml.cpp  \
     14        $$PWD/ConditionalSemaphore/conditionalsemaphore.cpp
     15
     16contains(QT, gui){
     17SOURCES += \
     18    $$PWD/jsonhighlighter/highlighter.cpp \
     19        $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.cpp \
     20    $$PWD/CustomTreeWidget/customtreewidget.cpp \
     21        $$PWD/LineNumberDisplay/LineNumberDisplay.cpp
     22}
    1923
    2024contains(QT, gui){
    2125HEADERS  += \
    2226    $$PWD/jsonhighlighter/highlighter.h  \
    23     $$PWD/CustomTreeWidget/customtreewidget.h
     27        $$PWD/BasicXMLSyntaxHighlighter/BasicXMLSyntaxHighlighter.h \
     28    $$PWD/CustomTreeWidget/customtreewidget.h \
     29        $$PWD/LineNumberDisplay/LineNumberDisplay.h
     30}
     31
     32# Extra libs
     33quazip {
     34        LIBS += -L$$PWD/zlib-1.2.8 -lz
     35
     36        win32 {
     37        LIBS += -L$$PWD/quazip-0.7.2/quazip/release -lquazip
     38        }
     39
     40        macx {
     41        LIBS += -L$$PWD/quazip-0.7.2/quazip -lquazip
     42        }
     43       
     44        INCLUDEPATH += $$PWD/zlib-1.2.8 \
     45        $$PWD/quazip-0.7.2/quazip
    2446}
    2547

  • s10k/CommonLibs/jsonhighlighter/highlighter.cpp

    r1073 r1096  
    3232void Highlighter::highlightBlock(const QString &text)
    3333{
    34     foreach (const HighlightingRule &rule, rules) {
     34    for (const HighlightingRule &rule : rules) {
    3535        QRegExp expression(rule.pattern);
    3636        int index = expression.indexIn(text);
Note: See TracChangeset for help on using the changeset viewer.