diff options
| author | Xizhi Zhu <xizhi.zhu@nokia.com> | 2011-11-02 10:29:08 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-03 12:17:28 +0100 |
| commit | a928afd9149c746400ba48a173b76fe2f8882753 (patch) | |
| tree | 38645a25c9f2fce30534eb362aed819bf6e156f8 /config.tests | |
| parent | 2edee608c5ecde146b9c6336e9f4b979267163aa (diff) | |
Refactor the screen saver code for Linux.
Merge JsonDb based and X11 based code into one file.
Use compile test to check if X11 is available.
Change-Id: I0ec7772457437744293f3fccec7e2628a88cd9f7
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Steffen Hahn <steffen.hahn@nokia.com>
Reviewed-by: Cristiano di Flora <cristiano.di-flora@nokia.com>
Diffstat (limited to 'config.tests')
| -rw-r--r-- | config.tests/x11/main.cpp | 48 | ||||
| -rw-r--r-- | config.tests/x11/x11.pro | 8 |
2 files changed, 56 insertions, 0 deletions
diff --git a/config.tests/x11/main.cpp b/config.tests/x11/main.cpp new file mode 100644 index 00000000..a1498b95 --- /dev/null +++ b/config.tests/x11/main.cpp @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtSystems module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include <X11/Xlib.h> + +int main() +{ + return 0; +} diff --git a/config.tests/x11/x11.pro b/config.tests/x11/x11.pro new file mode 100644 index 00000000..4dc4360c --- /dev/null +++ b/config.tests/x11/x11.pro @@ -0,0 +1,8 @@ +TEMPLATE = app + +CONFIG += link_pkgconfig +PKGCONFIG += x11 + +TARGET = x11 + +SOURCES += main.cpp |