diff options
author | Ilya Palachev <i.palachev@samsung.com> | 2015-07-21 16:31:07 +0300 |
---|---|---|
committer | Ilya Palachev <i.palachev@samsung.com> | 2015-07-23 13:22:55 +0300 |
commit | 6852873ac9f14297843742cb98f9856515b05777 (patch) | |
tree | 0e2d11185d46955dab44c287e378bf49ec5d0b4e | |
parent | 6617b28c461f2b5b8e734d5f368b6f7b43ab04fc (diff) | |
download | qtbase-6852873ac9f14297843742cb98f9856515b05777.tar.gz qtbase-6852873ac9f14297843742cb98f9856515b05777.tar.bz2 qtbase-6852873ac9f14297843742cb98f9856515b05777.zip |
add linux-g++-tizen/{qplatformdefs.h,qmake.conf}sandbox/ipalachev/tizen
Signed-off-by: Ilya Palachev <i.palachev@samsung.com>
-rw-r--r-- | mkspecs/devices/linux-g++-tizen/qmake.conf | 6 | ||||
-rw-r--r-- | mkspecs/devices/linux-g++-tizen/qplatformdefs.h | 34 | ||||
-rw-r--r-- | packaging/qt5.spec | 16 |
3 files changed, 56 insertions, 0 deletions
diff --git a/mkspecs/devices/linux-g++-tizen/qmake.conf b/mkspecs/devices/linux-g++-tizen/qmake.conf new file mode 100644 index 0000000000..23f6b257b1 --- /dev/null +++ b/mkspecs/devices/linux-g++-tizen/qmake.conf @@ -0,0 +1,6 @@ +include(../../common/linux-g++-tizen.conf) +include(../../common/g++-unix.conf) +include(../../common/linux.conf) +include(../../common/linux_device_pre.conf) + +load(qt_config) diff --git a/mkspecs/devices/linux-g++-tizen/qplatformdefs.h b/mkspecs/devices/linux-g++-tizen/qplatformdefs.h new file mode 100644 index 0000000000..ebd59e2f53 --- /dev/null +++ b/mkspecs/devices/linux-g++-tizen/qplatformdefs.h @@ -0,0 +1,34 @@ +/**************************************************************************** +** +** Copyright (©) 2015 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:LGPL21$ +** 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 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** 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. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "../../linux-g++/qplatformdefs.h" diff --git a/packaging/qt5.spec b/packaging/qt5.spec index b18faa9ad7..a71e7a20c8 100644 --- a/packaging/qt5.spec +++ b/packaging/qt5.spec @@ -263,6 +263,7 @@ Requires: %{name}-qtcore = %{version}-%{release} %description plugin-platform-offscreen This package contains the offscreen platform plugin +%ifnarch aarch64 %package plugin-platform-eglfs Summary: Eglfs platform plugin Group: Base/Libraries @@ -278,6 +279,7 @@ Requires: %{name}-qtcore = %{version}-%{release} %description plugin-platform-minimalegl This package contains the minimalegl platform plugin +%endif %package plugin-platform-linuxfb Summary: Linux framebuffer platform plugin @@ -391,7 +393,9 @@ This package contains the QtGui library Summary: Development files for QtGui Group: Base/Libraries Requires: %{name}-qtgui = %{version}-%{release} +%ifnarch aarch64 Requires: %{name}-qtopengl-devel +%endif %description qtgui-devel This package contains the files necessary to develop @@ -417,6 +421,7 @@ Requires: %{name}-qtnetwork = %{version}-%{release} This package contains the files necessary to develop applications that use QtNetwork +%ifnarch aarch64 %package qtopengl Summary: The QtOpenGL library Group: Base/Libraries @@ -440,6 +445,7 @@ Requires: pkgconfig(egl) %description qtopengl-devel This package contains the files necessary to develop applications that use QtOpenGL +%endif %package qtsql @@ -719,6 +725,10 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %fdupes %{buildroot}%{_includedir} %fdupes %{buildroot}%{_datadir} +%ifarch aarch64 +rm -rf %{buildroot}%{_datadir}/qt5/mkspecs/android-g++ +%endif + #### Pre/Post section @@ -752,10 +762,12 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %postun qttest /sbin/ldconfig +%ifnarch aarch64 %post qtopengl /sbin/ldconfig %postun qtopengl /sbin/ldconfig +%endif %post qtxml /sbin/ldconfig @@ -918,6 +930,7 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %{_datadir}/qt5/mkspecs/modules/qt_lib_network_private.pri +%ifnarch aarch64 %files qtopengl %defattr(-,root,root,-) %manifest %{name}.manifest @@ -943,6 +956,7 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %{_datadir}/qt5/mkspecs/android-g++/qplatformdefs.h %{_datadir}/qt5/mkspecs/modules/qt_lib_openglextensions.pri %{_datadir}/qt5/mkspecs/modules/qt_lib_openglextensions_private.pri +%endif %files qtsql @@ -1105,6 +1119,7 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %manifest %{name}.manifest %{_libdir}/qt5/plugins/platforms/libqoffscreen.so +%ifnarch aarch64 %files plugin-platform-eglfs %defattr(-,root,root,-) %manifest %{name}.manifest @@ -1114,6 +1129,7 @@ ln -s %{_sysconfdir}/xdg/qtchooser/5.conf %{buildroot}%{_sysconfdir}/xdg/qtchoos %defattr(-,root,root,-) %manifest %{name}.manifest %{_libdir}/qt5/plugins/platforms/libqminimalegl.so +%endif %files plugin-platform-linuxfb %defattr(-,root,root,-) |