1
0
Fork 0
forked from denis/a811

I accidantally deleted everything

This commit is contained in:
Denis Manherz 2024-08-26 11:53:44 +02:00
parent f325ad4502
commit 17ef7e510a
4 changed files with 21 additions and 9 deletions

8
.vscode/launch.json vendored
View file

@ -9,12 +9,8 @@
"type": "lldb", "type": "lldb",
"request": "launch", "request": "launch",
"program":"./build/bin/kirigami-hello", "program":"./build/bin/kirigami-hello",
"cwd":"$workspaceRoot", "cwd":"./",
"preRunCommands": [ "preLaunchTask": "CMake: build"
"echo a",
"cmake -B build",
"cmake --build build"
]
} }
], ],
} }

16
.vscode/tasks.json vendored Normal file
View file

@ -0,0 +1,16 @@
{
"version": "2.0.0",
"tasks": [
{
"type": "cmake",
"label": "CMake: build",
"command": "build",
"targets": [
"all"
],
"group": "build",
"problemMatcher": [],
"detail": "CMake template build task"
}
]
}

View file

@ -25,6 +25,7 @@ target_link_libraries(kirigami-hello
KF6::I18n KF6::I18n
KF6::CoreAddons KF6::CoreAddons
KF6::IconThemes KF6::IconThemes
usb-1.0
) )
install(TARGETS kirigami-hello ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(TARGETS kirigami-hello ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

View file

@ -6,6 +6,8 @@
#include <QQuickStyle> #include <QQuickStyle>
#include <QUrl> #include <QUrl>
#include <QtQml> #include <QtQml>
#include <libusb-1.0/libusb.h>
#include <iostream>
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
KIconTheme::initTheme(); // this is not available in nixpkgs version of KIconTheme::initTheme(); // this is not available in nixpkgs version of
@ -31,8 +33,6 @@ int main(int argc, char *argv[]) {
return -1; return -1;
} }
<<<<<<< Updated upstream
=======
libusb_init(NULL); libusb_init(NULL);
// discover devices // discover devices
libusb_device **list; libusb_device **list;
@ -43,6 +43,5 @@ int main(int argc, char *argv[]) {
libusb_free_device_list(list, 1); libusb_free_device_list(list, 1);
>>>>>>> Stashed changes
return app.exec(); return app.exec();
} }