Revert "Tizen: Refactored mkspecs. One platform for all profiles."

This reverts commit 059d84cc073f706d8207c42eb30dd30f0af2a1ea.

Change-Id: I62ef21b8920c4e4ba82c9ebf23bfd61eedfcc6b2

8 files changed, 176 insertions, 3 deletions

diff --git a/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf b/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf
new file mode 100644
index 0000000000..a4edbf06f2
--- /dev/null
+++ b/mkspecs/devices/linux-g++-tizen-emulator/qmake.conf
@@ -0,0 +1,32 @@
+#Copyright (©) 2013  Tomasz Olszak <olszak.tomasz@gmail.com>
+#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
new file mode 100644
index 0000000000..461f3d5589
--- /dev/null
+++ b/mkspecs/devices/linux-g++-tizen-emulator/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** 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
new file mode 100644
index 0000000000..adb59061a3
--- /dev/null
+++ b/mkspecs/devices/linux-g++-tizen-ivi/qmake.conf
@@ -0,0 +1,8 @@
+#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
new file mode 100644
index 0000000000..c665e8259b
--- /dev/null
+++ b/mkspecs/devices/linux-g++-tizen-ivi/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (©) 2013  Tomasz Olszak <olszak.tomasz@gmail.com>
+** 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
new file mode 100644
index 0000000000..8fa67b68c6
--- /dev/null
+++ b/mkspecs/devices/linux-g++-tizen-mobile/qmake.conf
@@ -0,0 +1,9 @@
+# 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
new file mode 100644
index 0000000000..c665e8259b
--- /dev/null
+++ b/mkspecs/devices/linux-g++-tizen-mobile/qplatformdefs.h
@@ -0,0 +1,42 @@
+/****************************************************************************
+**
+** Copyright (©) 2013  Tomasz Olszak <olszak.tomasz@gmail.com>
+** 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 85313afa65..f8e348c66c 100644
--- a/mkspecs/devices/linux-g++-tizen/qmake.conf
+++ b/mkspecs/devices/linux-g++-tizen/qmake.conf
@@ -14,6 +14,4 @@ contains(TIZEN_PROFILE, mobile) {
     DEFINES += Q_OS_LINUX_TIZEN_WEARABLE
 }
 
-!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 54a4b21504..afd3edaa97 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_MOBILE):!contains(DEFINES,Q_OS_LINUX_TIZEN_SIMULATOR): {
     qtHaveModule(dbus) {
         !mac:!win32:SUBDIRS += ibus
     }