diff options
Diffstat (limited to 'src/platformsupport/devicediscovery')
3 files changed, 86 insertions, 8 deletions
diff --git a/src/platformsupport/devicediscovery/devicediscovery.pri b/src/platformsupport/devicediscovery/devicediscovery.pri index 9a58eeedfe..9748129225 100644 --- a/src/platformsupport/devicediscovery/devicediscovery.pri +++ b/src/platformsupport/devicediscovery/devicediscovery.pri @@ -1,12 +1,17 @@ -linux:contains(QT_CONFIG, evdev) { - HEADERS += $$PWD/qdevicediscovery_p.h +HEADERS += $$PWD/qdevicediscovery_p.h +linux { contains(QT_CONFIG, libudev) { SOURCES += $$PWD/qdevicediscovery_udev.cpp - INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV - } else { + # Use our own define. QT_NO_LIBUDEV may not be set on non-Linux systems. + DEFINES += QDEVICEDISCOVERY_UDEV + } else: contains(QT_CONFIG, evdev) { SOURCES += $$PWD/qdevicediscovery_static.cpp + } else { + SOURCES += $$PWD/qdevicediscovery_dummy.cpp } +} else { + SOURCES += $$PWD/qdevicediscovery_dummy.cpp } diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_dummy.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_dummy.cpp new file mode 100644 index 0000000000..53e042272b --- /dev/null +++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy.cpp @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qdevicediscovery_p.h" + +QT_BEGIN_NAMESPACE + +QDeviceDiscovery *QDeviceDiscovery::create(QDeviceTypes types, QObject *parent) +{ + return new QDeviceDiscovery(types, parent); +} + +QDeviceDiscovery::QDeviceDiscovery(QDeviceTypes types, QObject *parent) + : QObject(parent), + m_types(types) +{ +} + +QDeviceDiscovery::~QDeviceDiscovery() +{ +} + +QStringList QDeviceDiscovery::scanConnectedDevices() +{ + return QStringList(); +} + +bool QDeviceDiscovery::checkDeviceType(const QString &device) +{ + Q_UNUSED(device); + return false; +} + +QT_END_NAMESPACE diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_p.h index 5485b73fd7..0e21118324 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_p.h @@ -44,8 +44,9 @@ #include <QObject> #include <QSocketNotifier> +#include <QStringList> -#ifndef QT_NO_LIBUDEV +#ifdef QDEVICEDISCOVERY_UDEV #include <libudev.h> #endif @@ -88,13 +89,13 @@ signals: void deviceDetected(const QString &deviceNode); void deviceRemoved(const QString &deviceNode); -#ifndef QT_NO_LIBUDEV +#ifdef QDEVICEDISCOVERY_UDEV private slots: void handleUDevNotification(); #endif private: -#ifndef QT_NO_LIBUDEV +#ifdef QDEVICEDISCOVERY_UDEV QDeviceDiscovery(QDeviceTypes types, struct udev *udev, QObject *parent = 0); bool checkDeviceType(struct udev_device *dev); #else @@ -104,7 +105,7 @@ private: QDeviceTypes m_types; -#ifndef QT_NO_LIBUDEV +#ifdef QDEVICEDISCOVERY_UDEV void startWatching(); void stopWatching(); |