From 5234489c353f103e83644081e12ec06728bd9cc1 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Fri, 18 Jan 2013 09:10:29 -0300 Subject: Updated to qt5 final. --- debian/control | 5 ++--- debian/qmenumodel-qml.install | 2 +- libqmenumodel/QMenuModel/CMakeLists.txt | 2 +- libqmenumodel/src/qmenumodel.pc.in | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/control b/debian/control index 4a85338..b086113 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,8 @@ Maintainer: Renato Araujo Oliveira Filho Build-Depends: debhelper (>= 9.0.0), cmake (>= 2.8.9), libglib2.0-dev, - qtbase (>= 5.0), - qtdeclarative (>= 5.0), + qtbase5-dev (>= 5.0), + qtdeclarative5-dev (>= 5.0), python3, python3-dbus, python3-gi, @@ -32,7 +32,6 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, libqmenumodel0 (= ${binary:Version}), - qtbase (>= 5.0), Description: Qt binding for GMenuModel - development files Qt binding for GMenuModel that allows connecting to a menu model exposed on D-Bus and presents it as a list model. diff --git a/debian/qmenumodel-qml.install b/debian/qmenumodel-qml.install index 58ec19a..b0cf4c8 100644 --- a/debian/qmenumodel-qml.install +++ b/debian/qmenumodel-qml.install @@ -1,2 +1,2 @@ -opt/qt5/imports/QMenuModel/* +/usr/lib/*/qt5/qml/QMenuModel/* diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt index 8a7702f..047938f 100644 --- a/libqmenumodel/QMenuModel/CMakeLists.txt +++ b/libqmenumodel/QMenuModel/CMakeLists.txt @@ -26,7 +26,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_S # Apparently, QT_IMPORTS_DIR didn’t make it to Qt5. # In want of a better solution, let’s hardcode it… -set(QT_IMPORTS_DIR /opt/qt5/imports) +set(QT_IMPORTS_DIR ${_qt5Qml_install_prefix}/${CMAKE_INSTALL_LIBDIR}/qt5/qml) set(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/QMenuModel") install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) diff --git a/libqmenumodel/src/qmenumodel.pc.in b/libqmenumodel/src/qmenumodel.pc.in index 1c410bc..56f149a 100644 --- a/libqmenumodel/src/qmenumodel.pc.in +++ b/libqmenumodel/src/qmenumodel.pc.in @@ -7,7 +7,7 @@ Name: qmenumodel Description: Qt binding for GMenuModel. Version: 0.1 -Requires.private: QtCore QtWidgets gio-2.0 +Requires.private: Qt5Core Qt5Widgets gio-2.0 Libs: -L${libdir} -l@SHAREDLIBNAME@ Cflags: -I${includedir}/@INCLUDEDIR@ -- cgit v1.2.3 From 5a4ff7ac613c74c0cbea9a6c22d0cdac7cee87dc Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Thu, 31 Jan 2013 01:22:06 -0300 Subject: Fixed files missing license header. --- examples/exportactiongroup.py | 15 +++++++++++++++ examples/exportmenu.py | 15 +++++++++++++++ tests/client/script_actiongrouptest.py | 13 +++++++++++++ tests/client/script_menuchangestest.py | 13 +++++++++++++ tests/client/script_modeltest.py | 15 +++++++++++++++ tests/client/script_qmltest.py | 14 ++++++++++++++ tests/client/script_servicetest.py | 14 ++++++++++++++ tests/script/menuscript.py | 15 +++++++++++++++ 8 files changed, 114 insertions(+) diff --git a/examples/exportactiongroup.py b/examples/exportactiongroup.py index 0f2d675..b1237a8 100755 --- a/examples/exportactiongroup.py +++ b/examples/exportactiongroup.py @@ -1,5 +1,20 @@ #!/usr/bin/env python3 # -*- encoding: utf-8 -*- +# +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# """ This example script exports an action group on the session bus under the name diff --git a/examples/exportmenu.py b/examples/exportmenu.py index 70cc6f3..4be3deb 100755 --- a/examples/exportmenu.py +++ b/examples/exportmenu.py @@ -1,5 +1,20 @@ #!/usr/bin/env python3 # -*- encoding: utf-8 -*- +# +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# """ This example script exports a menu model on the session bus under the name diff --git a/tests/client/script_actiongrouptest.py b/tests/client/script_actiongrouptest.py index bb54dae..c11a4cc 100755 --- a/tests/client/script_actiongrouptest.py +++ b/tests/client/script_actiongrouptest.py @@ -1,4 +1,17 @@ #!/usr/bin/env python3 +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . import time from gi.repository import GLib diff --git a/tests/client/script_menuchangestest.py b/tests/client/script_menuchangestest.py index 47e37bb..886303a 100755 --- a/tests/client/script_menuchangestest.py +++ b/tests/client/script_menuchangestest.py @@ -1,4 +1,17 @@ #!/usr/bin/env python3 +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . import time from menuscript import Script, ActionList, MENU_OBJECT_PATH diff --git a/tests/client/script_modeltest.py b/tests/client/script_modeltest.py index 9f5df9c..3a319b5 100755 --- a/tests/client/script_modeltest.py +++ b/tests/client/script_modeltest.py @@ -1,5 +1,20 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# + import time from gi.repository import GLib diff --git a/tests/client/script_qmltest.py b/tests/client/script_qmltest.py index c93e221..ad21762 100755 --- a/tests/client/script_qmltest.py +++ b/tests/client/script_qmltest.py @@ -1,4 +1,18 @@ #!/usr/bin/env python3 +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# import time from menuscript import Script, ActionList, MENU_OBJECT_PATH diff --git a/tests/client/script_servicetest.py b/tests/client/script_servicetest.py index c93e221..ad21762 100755 --- a/tests/client/script_servicetest.py +++ b/tests/client/script_servicetest.py @@ -1,4 +1,18 @@ #!/usr/bin/env python3 +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# import time from menuscript import Script, ActionList, MENU_OBJECT_PATH diff --git a/tests/script/menuscript.py b/tests/script/menuscript.py index 542308a..db71c08 100644 --- a/tests/script/menuscript.py +++ b/tests/script/menuscript.py @@ -1,3 +1,18 @@ +# Copyright 2013 Canonical Ltd. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; version 3. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program. If not, see . +# + import dbus import dbus.service from dbus import glib -- cgit v1.2.3 From 101c523f635c71d4ffaac79bee6b6dc574c73e68 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Thu, 31 Jan 2013 11:42:09 -0300 Subject: Fixed extra '/' in the file path. --- debian/qmenumodel-qml.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/qmenumodel-qml.install b/debian/qmenumodel-qml.install index b0cf4c8..8a1c4a9 100644 --- a/debian/qmenumodel-qml.install +++ b/debian/qmenumodel-qml.install @@ -1,2 +1,2 @@ -/usr/lib/*/qt5/qml/QMenuModel/* +usr/lib/*/qt5/qml/QMenuModel/* -- cgit v1.2.3 From e5b89efdcb47333503db2bd1dd81f107dc22c067 Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Thu, 31 Jan 2013 12:28:46 -0300 Subject: Used qmake to retrieve the import dir used to install QML modules. --- libqmenumodel/QMenuModel/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt index 047938f..7367e18 100644 --- a/libqmenumodel/QMenuModel/CMakeLists.txt +++ b/libqmenumodel/QMenuModel/CMakeLists.txt @@ -24,9 +24,11 @@ qt5_use_modules(qmenumodel-qml Qml Widgets) execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_SOURCE_DIR}/qmldir" "${CMAKE_CURRENT_BINARY_DIR}/qmldir") -# Apparently, QT_IMPORTS_DIR didn’t make it to Qt5. -# In want of a better solution, let’s hardcode it… -set(QT_IMPORTS_DIR ${_qt5Qml_install_prefix}/${CMAKE_INSTALL_LIBDIR}/qt5/qml) +execute_process( + COMMAND qmake -query QT_INSTALL_QML + OUTPUT_VARIABLE QT_IMPORTS_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE +) set(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/QMenuModel") install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) -- cgit v1.2.3 From 08e25df5e99773e05ab055d11655dff23a3d831d Mon Sep 17 00:00:00 2001 From: Renato Araujo Oliveira Filho Date: Thu, 31 Jan 2013 15:11:57 -0300 Subject: Added missing dependency. --- debian/control | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/control b/debian/control index b086113..1ad9f37 100644 --- a/debian/control +++ b/debian/control @@ -5,6 +5,8 @@ Maintainer: Renato Araujo Oliveira Filho Build-Depends: debhelper (>= 9.0.0), cmake (>= 2.8.9), libglib2.0-dev, + qt5-default, + qt5-qmake, qtbase5-dev (>= 5.0), qtdeclarative5-dev (>= 5.0), python3, -- cgit v1.2.3