Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- commit 4a630b3ae42e87c07d9a44cfb19a55ac99a56be6
- Author: Tasuku Suzuki <stasuku@gmail.com>
- Date: Sun Jan 12 02:18:46 2014 +0900
- WIP: add icu compile test
- this is a workaround.
- contains(QT_CONFIG,icu) should be used
- diff --git a/config.tests/icu/icu.cpp b/config.tests/icu/icu.cpp
- new file mode 100644
- index 0000000..f79dea5
- --- /dev/null
- +++ b/config.tests/icu/icu.cpp
- @@ -0,0 +1,54 @@
- +/****************************************************************************
- +**
- +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
- +** 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 <unicode/utypes.h>
- +#include <unicode/ucol.h>
- +#include <unicode/ustring.h>
- +
- +int main(int, char **)
- +{
- + UErrorCode status = U_ZERO_ERROR;
- + UCollator *collator = ucol_open("ru_RU", &status);
- + if (U_FAILURE(status))
- + return 0;
- + ucol_close(collator);
- + return 0;
- +}
- diff --git a/config.tests/icu/icu.pro b/config.tests/icu/icu.pro
- new file mode 100644
- index 0000000..2c1b431
- --- /dev/null
- +++ b/config.tests/icu/icu.pro
- @@ -0,0 +1,16 @@
- +SOURCES = icu.cpp
- +CONFIG += console
- +CONFIG -= qt dylib
- +win32 {
- + CONFIG(static, static|shared) {
- + CONFIG(debug, debug|release) {
- + LIBS += -lsicuind -lsicuucd -lsicudtd
- + } else {
- + LIBS += -lsicuin -lsicuuc -lsicudt
- + }
- + } else {
- + LIBS += -licuin -licuuc
- + }
- +} else {
- + LIBS += -licui18n -licuuc
- +}
- diff --git a/messagingframework.pro b/messagingframework.pro
- index 7c9ca9f..6db65ef 100644
- --- a/messagingframework.pro
- +++ b/messagingframework.pro
- @@ -1,6 +1,9 @@
- TEMPLATE = subdirs
- SUBDIRS = src tests
- +load(configure)
- +qtCompileTest(icu)
- +
- tests.depends = src
- !contains(DEFINES,QMF_NO_MESSAGE_SERVICE_EDITOR) {
- diff --git a/src/libraries/qmfclient/qmfclient.pro b/src/libraries/qmfclient/qmfclient.pro
- index 39c34bb..e01bfca 100644
- --- a/src/libraries/qmfclient/qmfclient.pro
- +++ b/src/libraries/qmfclient/qmfclient.pro
- @@ -184,7 +184,7 @@ unix: {
- QMAKE_PKGCONFIG_DESTDIR = pkgconfig
- }
- -packagesExist(icu-uc) {
- +config_icu {
- LIBS += -licui18n -licuuc -licudata
- PRIVATE_HEADERS += support/qcharsetdetector_p.h \
- support/qcharsetdetector.h
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement