From df46535ee3180e5ed70f4fe37e2ffc77c49afa2d Mon Sep 17 00:00:00 2001 From: Tomasz Olszak Date: Thu, 26 Feb 2015 15:41:21 +0100 Subject: Tizen: Refactored mkspecs. One platform for all profiles. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I81527298ec771b6bb3215ab4eb3f577a5629608c Reviewed-by: Jarosław Staniek Reviewed-by: Leon Anavi --- .../devices/linux-g++-tizen-emulator/qmake.conf | 32 ----------------- .../linux-g++-tizen-emulator/qplatformdefs.h | 42 ---------------------- mkspecs/devices/linux-g++-tizen-ivi/qmake.conf | 8 ----- .../devices/linux-g++-tizen-ivi/qplatformdefs.h | 42 ---------------------- mkspecs/devices/linux-g++-tizen-mobile/qmake.conf | 9 ----- .../devices/linux-g++-tizen-mobile/qplatformdefs.h | 42 ---------------------- mkspecs/devices/linux-g++-tizen/qmake.conf | 2 ++ .../platforminputcontexts.pro | 2 +- 8 files changed, 3 insertions(+), 176 deletions(-) delete mode 100644 mkspecs/devices/linux-g++-tizen-emulator/qmake.conf delete mode 100644 mkspecs/devices/linux-g++-tizen-emulator/qplatformdefs.h delete mode 100644 mkspecs/devices/linux-g++-tizen-ivi/qmake.conf delete mode 100644 mkspecs/devices/linux-g++-tizen-ivi/qplatformdefs.h delete mode 100644 mkspecs/devices/linux-g++-tizen-mobile/qmake.conf delete mode 100644 mkspecs/devices/linux-g++-tizen-mobile/qplatformdefs.h diff --git a/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf b/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf deleted file mode 100644 index a4edbf06f2..0000000000 --- a/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf +++ /dev/null @@ -1,32 +0,0 @@ -#Copyright (©) 2013 Tomasz Olszak -#All rights reserved. -#Redistribution and use in source and binary forms, with or without -#modification, are permitted provided that the following conditions -#are met: - -#1. Redistributions of source code must retain the copyright -# notice, this list of conditions and the following disclaimer. -#2. Redistributions in binary form must reproduce the copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -#3. The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. - -#THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -#IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -#OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -#IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -#INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -#NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -#THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -include(../common/linux_tizen_device_pre.conf) - -DEFINES += Q_OS_LINUX_TIZEN_SIMULATOR -QT_QPA_DEFAULT_PLATFORM = xcb -DEFINES += DFLT_XKB_CONFIG_ROOT='\\"/etc/X11/xkb\\"' - -load(qt_config) diff --git a/mkspecs/devices/linux-g++-tizen-emulator/qplatformdefs.h b/mkspecs/devices/linux-g++-tizen-emulator/qplatformdefs.h deleted file mode 100644 index 461f3d5589..0000000000 --- a/mkspecs/devices/linux-g++-tizen-emulator/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec 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 "../../linux-g++/qplatformdefs.h" diff --git a/mkspecs/devices/linux-g++-tizen-ivi/qmake.conf b/mkspecs/devices/linux-g++-tizen-ivi/qmake.conf deleted file mode 100644 index adb59061a3..0000000000 --- a/mkspecs/devices/linux-g++-tizen-ivi/qmake.conf +++ /dev/null @@ -1,8 +0,0 @@ -#Tizen ivi spec - -include(../common/linux_tizen_device_pre.conf) - -DEFINES += Q_OS_LINUX_TIZEN_IVI -QT_QPA_DEFAULT_PLATFORM = wayland - -load(qt_config) diff --git a/mkspecs/devices/linux-g++-tizen-ivi/qplatformdefs.h b/mkspecs/devices/linux-g++-tizen-ivi/qplatformdefs.h deleted file mode 100644 index c665e8259b..0000000000 --- a/mkspecs/devices/linux-g++-tizen-ivi/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (©) 2013 Tomasz Olszak -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec 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 "../../linux-g++/qplatformdefs.h" diff --git a/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf b/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf deleted file mode 100644 index 8fa67b68c6..0000000000 --- a/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf +++ /dev/null @@ -1,9 +0,0 @@ -# Tizen mobile spec - -include(../common/linux_tizen_device_pre.conf) - -DEFINES += Q_OS_LINUX_TIZEN_MOBILE -QT_QPA_DEFAULT_PLATFORM = xcb -DEFINES += DFLT_XKB_CONFIG_ROOT='\\"/etc/X11/xkb\\"' - -load(qt_config) diff --git a/mkspecs/devices/linux-g++-tizen-mobile/qplatformdefs.h b/mkspecs/devices/linux-g++-tizen-mobile/qplatformdefs.h deleted file mode 100644 index c665e8259b..0000000000 --- a/mkspecs/devices/linux-g++-tizen-mobile/qplatformdefs.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (©) 2013 Tomasz Olszak -** Contact: http://www.qt-project.org/legal -** -** This file is part of the qmake spec 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 "../../linux-g++/qplatformdefs.h" diff --git a/mkspecs/devices/linux-g++-tizen/qmake.conf b/mkspecs/devices/linux-g++-tizen/qmake.conf index ca3462492c..b41ac92a0c 100644 --- a/mkspecs/devices/linux-g++-tizen/qmake.conf +++ b/mkspecs/devices/linux-g++-tizen/qmake.conf @@ -10,4 +10,6 @@ contains(TIZEN_PROFILE, mobile) { DEFINES += Q_OS_LINUX_TIZEN_GENERIC } +!isEmpty(TIZEN_EMULATOR): DEFINES += QT_TIZEN_EMULATOR + load(qt_config) diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro index afd3edaa97..54a4b21504 100644 --- a/src/plugins/platforminputcontexts/platforminputcontexts.pro +++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -!contains(DEFINES,Q_OS_LINUX_TIZEN_MOBILE):!contains(DEFINES,Q_OS_LINUX_TIZEN_SIMULATOR): { +!contains(DEFINES,Q_OS_LINUX_TIZEN_MOBILE): { qtHaveModule(dbus) { !mac:!win32:SUBDIRS += ibus } -- cgit v1.2.3