updates to build system
This commit is contained in:
parent
b5911d6ed4
commit
02c3e84cb6
8 changed files with 97 additions and 36 deletions
|
@ -1,4 +1,5 @@
|
|||
add_executable(presenter)
|
||||
|
||||
add_executable(presenter main.cpp resources.qrc)
|
||||
|
||||
target_sources(presenter
|
||||
PRIVATE
|
||||
|
@ -15,20 +16,4 @@ target_sources(presenter
|
|||
mpv/qthelper.hpp mpv/mpvhelpers.h
|
||||
)
|
||||
|
||||
target_link_libraries(presenter
|
||||
Qt5::Quick
|
||||
Qt5::Qml
|
||||
Qt5::Gui
|
||||
Qt5::QuickControls2
|
||||
Qt5::Widgets
|
||||
Qt5::Sql
|
||||
Qt5::X11Extras
|
||||
KF5::Kirigami2
|
||||
KF5::CoreAddons
|
||||
KF5::I18n
|
||||
KF5::Archive
|
||||
podofo
|
||||
mpv
|
||||
)
|
||||
|
||||
target_compile_options (presenter PUBLIC -fexceptions)
|
||||
|
|
|
@ -43,6 +43,9 @@
|
|||
#include "filemanager.h"
|
||||
#include "slide.h"
|
||||
|
||||
// RUST
|
||||
#include "cxx-qt-gen/my_object.cxxqt.h"
|
||||
|
||||
static void connectToDatabase() {
|
||||
// let's setup our sql database
|
||||
QSqlDatabase db = QSqlDatabase::database();
|
||||
|
@ -128,6 +131,7 @@ int main(int argc, char *argv[])
|
|||
qmlRegisterType<ImageSqlModel>("org.presenter", 1, 0, "ImageSqlModel");
|
||||
qmlRegisterType<PresentationSqlModel>("org.presenter", 1, 0, "PresentationSqlModel");
|
||||
qmlRegisterType<ServiceItemModel>("org.presenter", 1, 0, "ServiceItemModel");
|
||||
qmlRegisterType<MyObject>("org.presenter", 1, 0, "MyObject");
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "SlideObject", slide.get());
|
||||
qmlRegisterSingletonInstance("org.presenter", 1, 0, "FileManager", filemanager.get());
|
||||
|
||||
|
|
|
@ -180,6 +180,12 @@ Kirigami.ApplicationWindow {
|
|||
/* print(loaded[0].audio); */
|
||||
}
|
||||
|
||||
MyObject {
|
||||
id: myObject
|
||||
number: 7
|
||||
string: "HI from rust in my proj: " + myObject.number
|
||||
}
|
||||
|
||||
Component.onCompleted: {
|
||||
/* showPassiveNotification(Kirigami.Settings.style); */
|
||||
/* Kirigami.Settings.style = "Plasma"; */
|
||||
|
|
|
@ -50,11 +50,13 @@ FocusScope {
|
|||
text: "Grid"
|
||||
icon.name: "view-app-grid-symbolic"
|
||||
hoverEnabled: true
|
||||
onClicked: myObject.sayHi(myObject.string, myObject.number);
|
||||
}
|
||||
Controls.ToolButton {
|
||||
text: "Details"
|
||||
icon.name: "view-list-details"
|
||||
hoverEnabled: true
|
||||
onClicked: showPassiveNotification(myObject.string);
|
||||
}
|
||||
Controls.ToolSeparator {}
|
||||
Item { Layout.fillWidth: true }
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue