diff options
| -rw-r--r-- | config.tests/unix/mtdev/mtdev.c | 49 | ||||
| -rw-r--r-- | config.tests/unix/mtdev/mtdev.pro | 6 | ||||
| -rwxr-xr-x | configure | 24 |
3 files changed, 79 insertions, 0 deletions
diff --git a/config.tests/unix/mtdev/mtdev.c b/config.tests/unix/mtdev/mtdev.c new file mode 100644 index 0000000000..f2e38145d8 --- /dev/null +++ b/config.tests/unix/mtdev/mtdev.c @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Jolla Ltd, author: <robin.burchell@jollamobile.com> +** Contact: http://www.qt-project.org/legal +** +** This file is part of the config.tests 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 <mtdev.h> + +int main(int, char **) +{ + mtdev m; + mtdev_open(&m, 0); + return 0; +} diff --git a/config.tests/unix/mtdev/mtdev.pro b/config.tests/unix/mtdev/mtdev.pro new file mode 100644 index 0000000000..4555bf416c --- /dev/null +++ b/config.tests/unix/mtdev/mtdev.pro @@ -0,0 +1,6 @@ +SOURCES = mtdev.c + +CONFIG += link_pkgconfig +PKGCONFIG_PRIVATE += mtdev + +CONFIG -= qt @@ -595,6 +595,7 @@ CFG_XVIDEO=auto CFG_XINERAMA=runtime CFG_XFIXES=runtime CFG_ZLIB=auto +CFG_MTDEV=auto CFG_SQLITE=qt CFG_GIF=auto CFG_PNG=yes @@ -1588,6 +1589,13 @@ while [ "$#" -gt 0 ]; do # No longer supported: #[ "$VAL" = "no" ] && CFG_LIBPNG=no ;; + mtdev) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_MTDEV="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; sqlite) if [ "$VAL" = "system" ]; then CFG_SQLITE=system @@ -2296,6 +2304,9 @@ Third Party Libraries: + -system-zlib ....... Use zlib from the operating system. See http://www.gzip.org/zlib + -no-mtdev ......... Do not compile mtdev support. + + -mtdev ............. Enable mtdev support. + -no-gif ............ Do not compile GIF reading support. -no-libpng ......... Do not compile PNG support. @@ -4396,6 +4407,17 @@ if [ "$CFG_ZLIB" = "auto" ]; then fi fi +if [ "$CFG_MTDEV" != "no" ]; then + if compileTest unix/mtdev "mtdev"; then + CFG_MTDEV=yes + else + CFG_MTDEV=no + fi +fi +if [ "$CFG_MTDEV" = "no" ]; then + QMakeVar add DEFINES QT_NO_MTDEV +fi + if [ "$CFG_LARGEFILE" = "auto" ]; then #Large files should be enabled for all Linux systems CFG_LARGEFILE=yes @@ -5857,6 +5879,7 @@ elif [ "$CFG_ZLIB" = "system" ]; then QT_CONFIG="$QT_CONFIG system-zlib" fi +[ "$CFG_MTDEV" = "yes" ] && QT_CONFIG="$QT_CONFIG mtdev" [ "$CFG_NIS" = "yes" ] && QT_CONFIG="$QT_CONFIG nis" [ "$CFG_CUPS" = "yes" ] && QT_CONFIG="$QT_CONFIG cups" [ "$CFG_ICONV" = "yes" ] && QT_CONFIG="$QT_CONFIG iconv" @@ -6753,6 +6776,7 @@ report_support " TDS .................." "$CFG_SQL_tds" plugin "plugin" yes " report_support " udev ..................." "$CFG_LIBUDEV" report_support " xkbcommon .............." "$CFG_XKBCOMMON" system "system library" qt "bundled copy" report_support " zlib ..................." "$CFG_ZLIB" system "system library" yes "bundled copy" +report_support " mtdev .................." "$CFG_MTDEV" yes "system library" echo |