diff options
Diffstat (limited to 'bluetooth')
| -rw-r--r-- | bluetooth/bluetoothmodel.cpp | 2 | ||||
| -rw-r--r-- | bluetooth/meson.build | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bluetooth/bluetoothmodel.cpp b/bluetooth/bluetoothmodel.cpp index 605f950..dafdd54 100644 --- a/bluetooth/bluetoothmodel.cpp +++ b/bluetooth/bluetoothmodel.cpp @@ -248,5 +248,5 @@ bool BluetoothModelFilter::filterAcceptsRow(int sourceRow, const QModelIndex &so QModelIndex index = model->index(sourceRow); bool paired = model->data(index, BluetoothModel::BluetoothRoles::PairedRole).toBool(); - return ((paired ? "true" : "false") == filterRegExp().pattern()); + return ((paired ? "true" : "false") == filterRegularExpression().pattern()); } diff --git a/bluetooth/meson.build b/bluetooth/meson.build index 008fda1..c8f7e0f 100644 --- a/bluetooth/meson.build +++ b/bluetooth/meson.build @@ -1,17 +1,17 @@ -qt5_dep = dependency('qt5', modules: ['Core', 'Qml']) +qt_dep = dependency('qt6', modules: ['Core', 'Qml']) glib_dep = [dependency('glib-2.0'), dependency('gio-2.0'), dependency('gobject-2.0'), dependency('gio-unix-2.0')] bluez_glib_dep = dependency('bluez-glib') -moc_files = qt5.compile_moc(headers : ['bluetooth.h', 'bluetoothmodel.h'], - dependencies: qt5_dep) +moc_files = qt.compile_moc(headers : ['bluetooth.h', 'bluetoothmodel.h'], + dependencies: qt_dep) src = ['bluetooth.cpp', 'bluetoothmodel.cpp', 'bluetootheventhandler.cpp', moc_files] lib = shared_library('qtappfw-bt', sources: src, version: '1.0.0', soversion: '0', - dependencies: [qt5_dep, glib_dep, bluez_glib_dep], + dependencies: [qt_dep, glib_dep, bluez_glib_dep], install: true) install_headers('bluetooth.h') @@ -21,7 +21,7 @@ pkg_mod.generate(libraries : lib, version : '1.0', name : 'libqtappfw-bt', filebase : 'qtappfw-bt', - requires: 'Qt5Qml', + requires: 'Qt6Qml', description : 'AGL Qt demo app framework helper library for using BlueZ.') qtappfw_bt_dep = declare_dependency(link_with: lib, |