fix: fix merge

This commit is contained in:
kuchy 2022-04-05 22:39:42 +02:00
parent 460f633d08
commit 5cea15f81a
18 changed files with 81 additions and 81 deletions

View File

@ -7,7 +7,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -76,7 +76,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -145,7 +145,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -214,7 +214,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -283,7 +283,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -352,7 +352,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -421,7 +421,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -490,7 +490,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -559,7 +559,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -628,76 +628,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"-nostdinc",
"-nostdinc++",
"-pipe",
"-g",
"-std=gnu++1z",
"-Wall",
"-Wextra",
"-D_REENTRANT",
"-fPIC",
"-fsyntax-only",
"-m64",
"--target=x86_64-linux-gnu",
"-DQ_CREATOR_RUN",
"-DQT_QML_DEBUG",
"-DQT_WIDGETS_LIB",
"-DQT_GUI_LIB",
"-DQT_CORE_LIB",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtWidgets",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtGui",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtCore",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/mkspecs/linux-g++",
"-isystem",
"/usr/include/c++/9",
"-isystem",
"/usr/include/x86_64-linux-gnu/c++/9",
"-isystem",
"/usr/include/c++/9/backward",
"-isystem",
"/usr/local/include",
"-isystem",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/libexec/qtcreator/clang/lib/clang/14.0.0/include",
"-isystem",
"/usr/include/x86_64-linux-gnu",
"-isystem",
"/usr/include",
"-fmessage-length=0",
"-fdiagnostics-show-note-include-stack",
"-fretain-comments-from-system-headers",
"-fmacro-backtrace-limit=0",
"-ferror-limit=1000",
"-x",
"c++-header",
"-Wno-unknown-pragmas",
"-Wno-unknown-warning-option",
"-Wno-documentation-unknown-command",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h"
],
"directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd",
"file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h"
},
{
"arguments": [
"clang",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -766,7 +697,76 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
"-g",
"-std=gnu++1z",
"-Wall",
"-Wextra",
"-D_REENTRANT",
"-fPIC",
"-fsyntax-only",
"-m64",
"--target=x86_64-linux-gnu",
"-DQ_CREATOR_RUN",
"-DQT_QML_DEBUG",
"-DQT_WIDGETS_LIB",
"-DQT_GUI_LIB",
"-DQT_CORE_LIB",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/lab1",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtWidgets",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtGui",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/include/QtCore",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/6.2.4/gcc_64/mkspecs/linux-g++",
"-isystem",
"/usr/include/c++/9",
"-isystem",
"/usr/include/x86_64-linux-gnu/c++/9",
"-isystem",
"/usr/include/c++/9/backward",
"-isystem",
"/usr/local/include",
"-isystem",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/libexec/qtcreator/clang/lib/clang/14.0.0/include",
"-isystem",
"/usr/include/x86_64-linux-gnu",
"-isystem",
"/usr/include",
"-fmessage-length=0",
"-fdiagnostics-show-note-include-stack",
"-fretain-comments-from-system-headers",
"-fmacro-backtrace-limit=0",
"-ferror-limit=1000",
"-x",
"c++-header",
"-Wno-unknown-pragmas",
"-Wno-unknown-warning-option",
"-Wno-documentation-unknown-command",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h"
],
"directory": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/.qtc_clangd",
"file": "/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/egui_lab1_krzysztof_rudnicki/build-lab1-Desktop_Qt_6_2_4_GCC_64bit-Debug/ui_blogentry.h"
},
{
"arguments": [
"clang",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders",
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",
@ -835,7 +835,7 @@
"-I",
"/home/kuchy/Zlew/Studia/NieNotatki/Projekty/nie_inzynierka/Programowanie/EGUI/QT/Tools/QtCreator/share/qtcreator/cplusplus/wrappedQtHeaders/QtCore",
"-I",
"/tmp/QtCreator-AYUSPB/clang-uiheader-dNZtxw",
"/tmp/QtCreator-ljgCTb/clang-uiheader-cAtbgT",
"-nostdinc",
"-nostdinc++",
"-pipe",