diff --git a/.cargo/config.toml b/.cargo/config.toml index 6aab056..b74f4d0 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,3 +1,3 @@ [env] -QMAKE = "/home/sinus/DEV/Qt/6.11.0/gcc_64/bin/qmake" +QMAKE = "/usr/bin/qmake6" QT_VERSION_MAJOR = "6" \ No newline at end of file diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..367e78c --- /dev/null +++ b/.clang-format @@ -0,0 +1,9 @@ +# We'll use defaults from the LLVM style, but with some modifications so that it's close to the CDT K&R style. +BasedOnStyle: LLVM +UseTab: Always +IndentWidth: 4 +TabWidth: 4 +PackConstructorInitializers: NextLineOnly +BreakConstructorInitializers: AfterColon +IndentAccessModifiers: false +AccessModifierOffset: -4 \ No newline at end of file diff --git a/poc001/build_config.default.json b/poc001/build_config.default.json index 6a31de4..1fe934c 100644 --- a/poc001/build_config.default.json +++ b/poc001/build_config.default.json @@ -1,20 +1,6 @@ { - "active_profile": "sinus", + "active_profile": "system", "profiles": { - "sinus": { - "qt": { - "qmake": "/home/sinus/DEV/Qt/6.11.0/gcc_64/bin/qmake", - "lib_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib", - "qml_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/qml", - "plugins_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/plugins", - "version_major": 6 - }, - "link": { - "rpaths": [ - "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib" - ] - } - }, "system": { "qt": { "qmake": "/usr/bin/qmake6", diff --git a/poc002/build_config.default.json b/poc002/build_config.default.json index 6a31de4..1fe934c 100644 --- a/poc002/build_config.default.json +++ b/poc002/build_config.default.json @@ -1,20 +1,6 @@ { - "active_profile": "sinus", + "active_profile": "system", "profiles": { - "sinus": { - "qt": { - "qmake": "/home/sinus/DEV/Qt/6.11.0/gcc_64/bin/qmake", - "lib_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib", - "qml_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/qml", - "plugins_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/plugins", - "version_major": 6 - }, - "link": { - "rpaths": [ - "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib" - ] - } - }, "system": { "qt": { "qmake": "/usr/bin/qmake6", diff --git a/poc003/build_config.default.json b/poc003/build_config.default.json index 6a31de4..1fe934c 100644 --- a/poc003/build_config.default.json +++ b/poc003/build_config.default.json @@ -1,20 +1,6 @@ { - "active_profile": "sinus", + "active_profile": "system", "profiles": { - "sinus": { - "qt": { - "qmake": "/home/sinus/DEV/Qt/6.11.0/gcc_64/bin/qmake", - "lib_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib", - "qml_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/qml", - "plugins_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/plugins", - "version_major": 6 - }, - "link": { - "rpaths": [ - "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib" - ] - } - }, "system": { "qt": { "qmake": "/usr/bin/qmake6", diff --git a/poc004/build_config.default.json b/poc004/build_config.default.json index 6a31de4..1fe934c 100644 --- a/poc004/build_config.default.json +++ b/poc004/build_config.default.json @@ -1,20 +1,6 @@ { - "active_profile": "sinus", + "active_profile": "system", "profiles": { - "sinus": { - "qt": { - "qmake": "/home/sinus/DEV/Qt/6.11.0/gcc_64/bin/qmake", - "lib_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib", - "qml_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/qml", - "plugins_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/plugins", - "version_major": 6 - }, - "link": { - "rpaths": [ - "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib" - ] - } - }, "system": { "qt": { "qmake": "/usr/bin/qmake6", diff --git a/poc005/Cargo.toml b/poc005/Cargo.toml index e00f1e1..0c3d8cb 100644 --- a/poc005/Cargo.toml +++ b/poc005/Cargo.toml @@ -21,4 +21,3 @@ glib = { workspace = true, features = [] } gstreamer = { workspace = true, features = ["serde"] } gstreamer-app = { workspace = true, features = [] } gstreamer-video = { workspace = true, features = ["serde"] } - diff --git a/poc005/build_config.default.json b/poc005/build_config.default.json index 6a31de4..1fe934c 100644 --- a/poc005/build_config.default.json +++ b/poc005/build_config.default.json @@ -1,20 +1,6 @@ { - "active_profile": "sinus", + "active_profile": "system", "profiles": { - "sinus": { - "qt": { - "qmake": "/home/sinus/DEV/Qt/6.11.0/gcc_64/bin/qmake", - "lib_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib", - "qml_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/qml", - "plugins_dir": "/home/sinus/DEV/Qt/6.11.0/gcc_64/plugins", - "version_major": 6 - }, - "link": { - "rpaths": [ - "/home/sinus/DEV/Qt/6.11.0/gcc_64/lib" - ] - } - }, "system": { "qt": { "qmake": "/usr/bin/qmake6",