From 57987ad57139be7b29e74d7eb60777b3ebb9e271 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 28 Sep 2016 18:04:41 +0200 Subject: fix freetype/fontconfig configure system convert the ugly config.tests/[...]/freetype.pri file into a custom callback in configure.pri, and reinstate pkg-config use for freetype. subsequently, use QMAKE_USE for the actual library references. this fixes in particular cross-builds, as the new configure was not passing the necessary information to the test any more, so the old .pri file misbehaved. Task-number: QTBUG-54911 Change-Id: I5fc9c254334a2675f7db4d54df4c77637e8e2487 Reviewed-by: Laszlo Agocs --- config.tests/unix/fontconfig/fontconfig.pro | 1 - config.tests/unix/freetype/freetype.pri | 15 --------------- config.tests/unix/freetype/freetype.pro | 1 - 3 files changed, 17 deletions(-) delete mode 100644 config.tests/unix/freetype/freetype.pri (limited to 'config.tests') diff --git a/config.tests/unix/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro index 82dcfc80a0..d6fd00aa3c 100644 --- a/config.tests/unix/fontconfig/fontconfig.pro +++ b/config.tests/unix/fontconfig/fontconfig.pro @@ -1,3 +1,2 @@ SOURCES = fontconfig.cpp CONFIG -= qt -include(../../unix/freetype/freetype.pri) diff --git a/config.tests/unix/freetype/freetype.pri b/config.tests/unix/freetype/freetype.pri deleted file mode 100644 index 05299ed2fd..0000000000 --- a/config.tests/unix/freetype/freetype.pri +++ /dev/null @@ -1,15 +0,0 @@ -!cross_compile { - TRY_INCLUDEPATHS = /include /usr/include $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - # LSB doesn't allow using headers from /include or /usr/include - linux-lsb-g++:TRY_INCLUDEPATHS = $$QMAKE_INCDIR $$QMAKE_INCDIR_X11 $$INCLUDEPATH - haiku:TRY_INCLUDEPATHS += /system/develop/headers - for(p, TRY_INCLUDEPATHS) { - p = $$join(p, "", "", "/freetype2") - exists($$p):INCLUDEPATH *= $$p - } -} else { - # If we are cross-compiling, then there is still a remote possibility that - # configure detected font-config & freetype, stored in these variables. - QMAKE_CFLAGS += $$QMAKE_CFLAGS_FONTCONFIG - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_FONTCONFIG -} diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro index 1a9f06909a..525b60121b 100644 --- a/config.tests/unix/freetype/freetype.pro +++ b/config.tests/unix/freetype/freetype.pro @@ -1,3 +1,2 @@ SOURCES = freetype.cpp CONFIG -= qt -include(freetype.pri) -- cgit v1.2.3 From b4085e56b9040247393b279f64b8cd63af863798 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 6 Oct 2016 14:51:36 +0200 Subject: Migrate libinput support away from QT_LIBRARY_VERSION There may not be a version when libinput is not picked up via pkg-config. Add a config test instead. Task-number: QTBUG-56017 Change-Id: I421af4cef1b896413a4ebda561809a8b2a3386b3 Reviewed-by: Oswald Buddenhagen --- .../unix/libinput_axis_api/libinput_axis_api.cpp | 46 ++++++++++++++++++++++ .../unix/libinput_axis_api/libinput_axis_api.pro | 2 + 2 files changed, 48 insertions(+) create mode 100644 config.tests/unix/libinput_axis_api/libinput_axis_api.cpp create mode 100644 config.tests/unix/libinput_axis_api/libinput_axis_api.pro (limited to 'config.tests') diff --git a/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp b/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp new file mode 100644 index 0000000000..d469b8920e --- /dev/null +++ b/config.tests/unix/libinput_axis_api/libinput_axis_api.cpp @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include + +int main() +{ + libinput_event_pointer_has_axis(nullptr, LIBINPUT_POINTER_AXIS_SCROLL_VERTICAL); + return 0; +} diff --git a/config.tests/unix/libinput_axis_api/libinput_axis_api.pro b/config.tests/unix/libinput_axis_api/libinput_axis_api.pro new file mode 100644 index 0000000000..7221e62792 --- /dev/null +++ b/config.tests/unix/libinput_axis_api/libinput_axis_api.pro @@ -0,0 +1,2 @@ +SOURCES = libinput_axis_api.cpp +CONFIG -= qt -- cgit v1.2.3