diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:06:25 +0100 |
commit | 30fd22b9574def54726e7b193127cc0c901c1b4c (patch) | |
tree | 96dfc923044db0515064ba39d052d9ed577e3e40 /config.tests/unix | |
parent | d7b0581c1c2ef60c08d238dae39298af6904918f (diff) | |
parent | 6aa09bbce59828d028f6d1e81d2bfc6ba537aae1 (diff) |
Merge remote-tracking branch 'origin/dev' into stable
Change-Id: Ice524edcc51373509f0023ae7f7c2963f4602f88
Diffstat (limited to 'config.tests/unix')
-rw-r--r-- | config.tests/unix/iconv/iconv.pro | 2 | ||||
-rw-r--r-- | config.tests/unix/journald/journald.c | 48 | ||||
-rw-r--r-- | config.tests/unix/journald/journald.pro | 6 | ||||
-rw-r--r-- | config.tests/unix/lgmon/lgmon.cpp | 49 | ||||
-rw-r--r-- | config.tests/unix/lgmon/lgmon.pro | 3 | ||||
-rw-r--r-- | config.tests/unix/neon/neon.pro | 4 | ||||
-rw-r--r-- | config.tests/unix/odbc/odbc.pro | 2 | ||||
-rw-r--r-- | config.tests/unix/qqnx_imf/qqnx_imf.cpp (renamed from config.tests/unix/neon/neon.cpp) | 13 | ||||
-rw-r--r-- | config.tests/unix/qqnx_imf/qqnx_imf.pro | 3 |
9 files changed, 116 insertions, 14 deletions
diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro index 1ef6aa7207..65a67f16d3 100644 --- a/config.tests/unix/iconv/iconv.pro +++ b/config.tests/unix/iconv/iconv.pro @@ -1,3 +1,3 @@ SOURCES = iconv.cpp CONFIG -= qt dylib -mac|win32-g++*|qnx:LIBS += -liconv +mac|mingw|qnx:LIBS += -liconv diff --git a/config.tests/unix/journald/journald.c b/config.tests/unix/journald/journald.c new file mode 100644 index 0000000000..470d526e68 --- /dev/null +++ b/config.tests/unix/journald/journald.c @@ -0,0 +1,48 @@ +/**************************************************************************** +** +** Copyright (C) 2014 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 <systemd/sd-journal.h> + +int main(int argc, char **argv) +{ + sd_journal_print_with_location(LOG_INFO, "CODE_FILE=foo.c", "CODE_LINE=0", "unknown_function", "test message"); + return 0; +} diff --git a/config.tests/unix/journald/journald.pro b/config.tests/unix/journald/journald.pro new file mode 100644 index 0000000000..2bb50ceb71 --- /dev/null +++ b/config.tests/unix/journald/journald.pro @@ -0,0 +1,6 @@ +SOURCES = journald.c + +CONFIG += link_pkgconfig +PKGCONFIG_PRIVATE += libsystemd-journal + +CONFIG -= qt diff --git a/config.tests/unix/lgmon/lgmon.cpp b/config.tests/unix/lgmon/lgmon.cpp new file mode 100644 index 0000000000..4935775806 --- /dev/null +++ b/config.tests/unix/lgmon/lgmon.cpp @@ -0,0 +1,49 @@ +/*************************************************************************** +** +** Copyright (C) 2014 BlackBerry Limited. All rights reserved. +** 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 <lgmon.h> + +int main(int, char **) +{ + lgmon_supported(getpid()); + return 0; +} + diff --git a/config.tests/unix/lgmon/lgmon.pro b/config.tests/unix/lgmon/lgmon.pro new file mode 100644 index 0000000000..7bd094dc86 --- /dev/null +++ b/config.tests/unix/lgmon/lgmon.pro @@ -0,0 +1,3 @@ +SOURCES = lgmon.cpp +CONFIG -= qt +LIBS += -llgmon diff --git a/config.tests/unix/neon/neon.pro b/config.tests/unix/neon/neon.pro deleted file mode 100644 index efd608bd63..0000000000 --- a/config.tests/unix/neon/neon.pro +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES = neon.cpp -CONFIG -= x11 qt -isEmpty(QMAKE_CFLAGS_NEON):error("This compiler does not support Neon") -else:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_NEON diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro index 418a0e0d54..70f3b668da 100644 --- a/config.tests/unix/odbc/odbc.pro +++ b/config.tests/unix/odbc/odbc.pro @@ -1,4 +1,4 @@ SOURCES = odbc.cpp CONFIG -= qt dylib -win32-g++*:LIBS += -lodbc32 +mingw:LIBS += -lodbc32 else:LIBS += -lodbc diff --git a/config.tests/unix/neon/neon.cpp b/config.tests/unix/qqnx_imf/qqnx_imf.cpp index ccbb476367..b88593bf33 100644 --- a/config.tests/unix/neon/neon.cpp +++ b/config.tests/unix/qqnx_imf/qqnx_imf.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 BlackBerry Limited. All rights reserved. ** Contact: http://www.qt-project.org/legal ** ** This file is part of the config.tests of the Qt Toolkit. @@ -39,13 +39,10 @@ ** ****************************************************************************/ -#include <arm_neon.h> +#include "imf/imf_client.h" -int main(int, char**) +int main(int, char **) { - int32x4_t null = vdupq_n_s32(0x0); - - int result; - vst1q_lane_s32(&result, null, 0); - return result; + imf_client_init(); + return 0; } diff --git a/config.tests/unix/qqnx_imf/qqnx_imf.pro b/config.tests/unix/qqnx_imf/qqnx_imf.pro new file mode 100644 index 0000000000..c51adb65ad --- /dev/null +++ b/config.tests/unix/qqnx_imf/qqnx_imf.pro @@ -0,0 +1,3 @@ +SOURCES = qqnx_imf.cpp +CONFIG -= qt +LIBS += -linput_client |