Skip to content

Commit

Permalink
Merge branch 'latest' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
Paracetamol56 committed Mar 11, 2022
2 parents d15e0ad + c7b531f commit 88f12c5
Show file tree
Hide file tree
Showing 754 changed files with 2,133 additions and 1,453 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/header-comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,21 @@ jobs:
steps:
- name: Checkout
uses: actions/[email protected]
- name: Add comments to /
- name: Add comments to /src
uses: koj-co/[email protected]
with:
directory: /
- name: Add comments to angleutilities
directory: /src
- name: Add comments to /src/angleutilities
uses: koj-co/[email protected]
with:
directory: angleutilities
- name: Add comments to dialogs
directory: /src/angleutilities
- name: Add comments to /src/dialogs
uses: koj-co/[email protected]
with:
directory: dialogs
- name: Add comments to tables
directory: /src/dialogs
- name: Add comments to /src/tables
uses: koj-co/[email protected]
with:
directory: tables
directory: /src/tables
- name: Create pull request with changes
uses: peter-evans/create-pull-request@v3
16 changes: 8 additions & 8 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,23 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Check include guards in /
- name: Check include guards in src/
uses: sbeyer/[email protected]
with:
path: '/'
path: 'src/'
pattern: '{file_base}_H'
- name: Check include guards in angleutilities/
- name: Check include guards in src/angleutilities/
uses: sbeyer/[email protected]
with:
path: 'angleutilities/'
path: 'src/angleutilities/'
pattern: '{file_base}_H'
- name: Check include guards in dialogs/
- name: Check include guards in src/dialogs/
uses: sbeyer/[email protected]
with:
path: 'dialogs/'
path: 'src/dialogs/'
pattern: '{file_base}_H'
- name: Check include guards in tables/
- name: Check include guards in src/tables/
uses: sbeyer/[email protected]
with:
path: 'tables/'
path: 'src/tables/'
pattern: '{file_base}_H'
Binary file modified Database/emptyDatabase.sqlite
Binary file not shown.
21 changes: 21 additions & 0 deletions build-Observeur2-Desktop_Qt_6_2_0_MinGW_64_bit-Debug/.qmake.stash
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
QMAKE_CXX.QT_COMPILER_STDCXX = 201402L
QMAKE_CXX.QMAKE_GCC_MAJOR_VERSION = 8
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/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++ \
C:/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/x86_64-w64-mingw32 \
C:/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include/c++/backward \
C:/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include \
C:/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0/include-fixed \
C:/Qt/Tools/mingw810_64/x86_64-w64-mingw32/include
QMAKE_CXX.LIBDIRS = \
C:/Qt/Tools/mingw810_64/lib/gcc/x86_64-w64-mingw32/8.1.0 \
C:/Qt/Tools/mingw810_64/lib/gcc \
C:/Qt/Tools/mingw810_64/x86_64-w64-mingw32/lib \
C:/Qt/Tools/mingw810_64/lib
Loading

0 comments on commit 88f12c5

Please sign in to comment.