I accidantally deleted everything
This commit is contained in:
parent
f325ad4502
commit
17ef7e510a
8
.vscode/launch.json
vendored
8
.vscode/launch.json
vendored
|
|
@ -9,12 +9,8 @@
|
|||
"type": "lldb",
|
||||
"request": "launch",
|
||||
"program":"./build/bin/kirigami-hello",
|
||||
"cwd":"$workspaceRoot",
|
||||
"preRunCommands": [
|
||||
"echo a",
|
||||
"cmake -B build",
|
||||
"cmake --build build"
|
||||
]
|
||||
"cwd":"./",
|
||||
"preLaunchTask": "CMake: build"
|
||||
}
|
||||
],
|
||||
}
|
||||
16
.vscode/tasks.json
vendored
Normal file
16
.vscode/tasks.json
vendored
Normal 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"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -25,6 +25,7 @@ target_link_libraries(kirigami-hello
|
|||
KF6::I18n
|
||||
KF6::CoreAddons
|
||||
KF6::IconThemes
|
||||
usb-1.0
|
||||
)
|
||||
|
||||
install(TARGETS kirigami-hello ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
|
|
|
|||
|
|
@ -6,6 +6,8 @@
|
|||
#include <QQuickStyle>
|
||||
#include <QUrl>
|
||||
#include <QtQml>
|
||||
#include <libusb-1.0/libusb.h>
|
||||
#include <iostream>
|
||||
|
||||
int main(int argc, char *argv[]) {
|
||||
KIconTheme::initTheme(); // this is not available in nixpkgs version of
|
||||
|
|
@ -31,8 +33,6 @@ int main(int argc, char *argv[]) {
|
|||
return -1;
|
||||
}
|
||||
|
||||
<<<<<<< Updated upstream
|
||||
=======
|
||||
libusb_init(NULL);
|
||||
// discover devices
|
||||
libusb_device **list;
|
||||
|
|
@ -43,6 +43,5 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
libusb_free_device_list(list, 1);
|
||||
|
||||
>>>>>>> Stashed changes
|
||||
return app.exec();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue