Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[connectionagent] Fix Qt5 QML installation.
  • Loading branch information
martinjones committed Jun 5, 2013
1 parent 45dd903 commit 3414e76
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
10 changes: 7 additions & 3 deletions connectionagentplugin/connectionagentplugin.pro
Expand Up @@ -11,7 +11,7 @@ equals(QT_MAJOR_VERSION, 4): {
QT += declarative
}
equals(QT_MAJOR_VERSION, 5): {
QT += quick
QT += qml
}
SOURCES += \
connectionagentplugin_plugin.cpp \
Expand All @@ -25,8 +25,12 @@ HEADERS += \

OTHER_FILES = qmldir

target.path = $$[QT_INSTALL_IMPORTS]/com/jolla/connection
MODULENAME = com/jolla/connection
equals(QT_MAJOR_VERSION, 4): TARGETPATH = $$[QT_INSTALL_IMPORTS]/$$MODULENAME
equals(QT_MAJOR_VERSION, 5): TARGETPATH = $$[QT_INSTALL_QML]/$$MODULENAME

target.path = $$TARGETPATH
qmldir.files += qmldir
qmldir.path = $$[QT_INSTALL_IMPORTS]/com/jolla/connection
qmldir.path = $$TARGETPATH

INSTALLS += target qmldir
6 changes: 3 additions & 3 deletions rpm/connectionagent-qt5.spec
Expand Up @@ -9,7 +9,7 @@ Name: connectionagent-qt5
# << macros

Summary: User Agent daemon
Version: 0.6.10
Version: 0.6.11
Release: 0
Group: Communications/Connectivity Adaptation
License: LGPLv2
Expand All @@ -22,7 +22,7 @@ BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(connman-qt5)
BuildRequires: pkgconfig(Qt5Network)
BuildRequires: pkgconfig(Qt5Test)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5Qml)

%description
Connection Agent provides multi user access to connman's User Agent.
Expand Down Expand Up @@ -83,7 +83,7 @@ rm -rf %{buildroot}

%files declarative
%defattr(-,root,root,-)
%{_libdir}/qt5/imports/com/jolla/connection/*
%{_libdir}/qt5/qml/com/jolla/connection/*
# >> files declarative
# << files declarative

Expand Down
6 changes: 3 additions & 3 deletions rpm/connectionagent-qt5.yaml
@@ -1,6 +1,6 @@
Name: connectionagent-qt5
Summary: User Agent daemon
Version: 0.6.10
Version: 0.6.11
Release: 0
Group: "Communications/Connectivity Adaptation"
License: LGPLv2
Expand All @@ -20,7 +20,7 @@ PkgConfigBR:
- connman-qt5
- Qt5Network
- Qt5Test
- Qt5Quick
- Qt5Qml

Configure: none
Builder: qmake5
Expand All @@ -36,7 +36,7 @@ SubPackages:
Requires:
- "%{name} = %{version}"
Files:
- "%{_libdir}/qt5/imports/com/jolla/connection/*"
- "%{_libdir}/qt5/qml/com/jolla/connection/*"

- Name: test
Summary: auto test for connection agent.
Expand Down

0 comments on commit 3414e76

Please sign in to comment.