Merge pull request 'dev' (#2) from dev into main

Reviewed-on: #2
This commit is contained in:
Giovanni-Josserand 2025-07-14 21:32:56 +00:00
commit f08d7c5cbc
623 changed files with 3583 additions and 6 deletions

View File

@ -9,16 +9,26 @@ CONFIG += c++17
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
SOURCES += \
character.cpp \
main.cpp \
mainwindow.cpp
mainwindow.cpp \
notepad.cpp \
textformatutils.cpp
HEADERS += \
mainwindow.h
character.h \
mainwindow.h \
notepad.h \
textformatutils.h
FORMS += \
mainwindow.ui
mainwindow.ui \
notepad.ui \
# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
RESOURCES += \
data.qrc

View File

@ -0,0 +1,21 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 201703L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 13
QMAKE_CXX.QMAKE_GCC_MINOR_VERSION = 1
QMAKE_CXX.QMAKE_GCC_PATCH_VERSION = 0
QMAKE_CXX.COMPILER_MACROS = \
QT_COMPILER_STDCXX \
QMAKE_GCC_MAJOR_VERSION \
QMAKE_GCC_MINOR_VERSION \
QMAKE_GCC_PATCH_VERSION
QMAKE_CXX.INCDIRS = \
C:/Qt/Tools/mingw1310_64/lib/gcc/x86_64-w64-mingw32/13.1.0/include/c++ \
C:/Qt/Tools/mingw1310_64/lib/gcc/x86_64-w64-mingw32/13.1.0/include/c++/x86_64-w64-mingw32 \
C:/Qt/Tools/mingw1310_64/lib/gcc/x86_64-w64-mingw32/13.1.0/include/c++/backward \
C:/Qt/Tools/mingw1310_64/lib/gcc/x86_64-w64-mingw32/13.1.0/include \
C:/Qt/Tools/mingw1310_64/lib/gcc/x86_64-w64-mingw32/13.1.0/include-fixed \
C:/Qt/Tools/mingw1310_64/x86_64-w64-mingw32/include
QMAKE_CXX.LIBDIRS = \
C:/Qt/Tools/mingw1310_64/lib/gcc/x86_64-w64-mingw32/13.1.0 \
C:/Qt/Tools/mingw1310_64/lib/gcc \
C:/Qt/Tools/mingw1310_64/x86_64-w64-mingw32/lib \
C:/Qt/Tools/mingw1310_64/lib

Some files were not shown because too many files have changed in this diff Show More