From a871c7fee27897a30cd1fc12ef9219acc3c9af85 Mon Sep 17 00:00:00 2001 From: Lorn Potter Date: Mon, 18 Mar 2013 13:51:00 -0700 Subject: [PATCH] Initial commit --- COPYING | 510 +++++++++++++++++ README.md | 4 + connd/com.jollamobile.Connectiond.xml | 27 + connd/conn.xml | 28 + connd/connadaptor.cpp | 49 ++ connd/connadaptor.h | 72 +++ connd/connd.pro | 41 ++ connd/main.cpp | 82 +++ connd/qconnectionmanager.cpp | 226 ++++++++ connd/qconnectionmanager.h | 104 ++++ connectionagent.pro | 17 + connectionagent.pro.user | 531 ++++++++++++++++++ .../connectionagentplugin.cpp | 114 ++++ connectionagentplugin/connectionagentplugin.h | 43 ++ .../connectionagentplugin.pro | 27 + .../connectionagentplugin_plugin.cpp | 15 + .../connectionagentplugin_plugin.h | 19 + .../connectionamanagerinterface.cpp | 26 + .../connectionamanagerinterface.h | 67 +++ connectionagentplugin/qmldir | 2 + makedist | 53 ++ rpm/connectionagent.conf | 11 + rpm/connectionagent.service | 12 + rpm/connectionagent.yaml | 36 ++ test/testqml/cover/CoverPage.qml | 27 + test/testqml/main.cpp | 17 + test/testqml/main.qml | 29 + test/testqml/pages/FirstPage.qml | 40 ++ test/testqml/pages/SecondPage.qml | 26 + test/testqml/rpm/testqml.yaml | 31 + .../sailfishapplication.cpp | 74 +++ .../sailfishapplication/sailfishapplication.h | 18 + .../sailfishapplication.pri | 34 ++ test/testqml/testqml.desktop | 8 + test/testqml/testqml.pro | 20 + test/testqml/testqml2.qml | 17 + 36 files changed, 2457 insertions(+) create mode 100644 COPYING create mode 100644 README.md create mode 100644 connd/com.jollamobile.Connectiond.xml create mode 100644 connd/conn.xml create mode 100644 connd/connadaptor.cpp create mode 100644 connd/connadaptor.h create mode 100644 connd/connd.pro create mode 100644 connd/main.cpp create mode 100644 connd/qconnectionmanager.cpp create mode 100644 connd/qconnectionmanager.h create mode 100644 connectionagent.pro create mode 100644 connectionagent.pro.user create mode 100644 connectionagentplugin/connectionagentplugin.cpp create mode 100644 connectionagentplugin/connectionagentplugin.h create mode 100644 connectionagentplugin/connectionagentplugin.pro create mode 100644 connectionagentplugin/connectionagentplugin_plugin.cpp create mode 100644 connectionagentplugin/connectionagentplugin_plugin.h create mode 100644 connectionagentplugin/connectionamanagerinterface.cpp create mode 100644 connectionagentplugin/connectionamanagerinterface.h create mode 100644 connectionagentplugin/qmldir create mode 100755 makedist create mode 100644 rpm/connectionagent.conf create mode 100644 rpm/connectionagent.service create mode 100644 rpm/connectionagent.yaml create mode 100644 test/testqml/cover/CoverPage.qml create mode 100644 test/testqml/main.cpp create mode 100644 test/testqml/main.qml create mode 100644 test/testqml/pages/FirstPage.qml create mode 100644 test/testqml/pages/SecondPage.qml create mode 100644 test/testqml/rpm/testqml.yaml create mode 100644 test/testqml/sailfishapplication/sailfishapplication.cpp create mode 100644 test/testqml/sailfishapplication/sailfishapplication.h create mode 100644 test/testqml/sailfishapplication/sailfishapplication.pri create mode 100644 test/testqml/testqml.desktop create mode 100644 test/testqml/testqml.pro create mode 100644 test/testqml/testqml2.qml diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..2d2d780 --- /dev/null +++ b/COPYING @@ -0,0 +1,510 @@ + + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 Free Software Foundation, Inc. + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations +below. + + When we speak of free software, we are referring to freedom of use, +not price. Our General Public Licenses are designed to make sure that +you have the freedom to distribute copies of free software (and charge +for this service if you wish); that you receive source code or can get +it if you want it; that you can change the software and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it +becomes a de-facto standard. To achieve this, non-free programs must +be allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, complete source code means +all the source code for all modules it contains, plus any associated +interface definition files, plus the scripts used to control +compilation and installation of the library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete source code as you receive it, in any medium, provided that +you conspicuously and appropriately publish on each copy an +appropriate copyright notice and disclaimer of warranty; keep intact +all the notices that refer to this License and to the absence of any +warranty; and distribute a copy of this License along with the +Library. + + You may charge a fee for the physical act of transferring a copy, +and you may at your option offer warranty protection in exchange for a +fee. + + 2. You may modify your copy or copies of the Library or any portion +of it, thus forming a work based on the Library, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Library, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote +it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you accompany +it with the complete corresponding machine-readable source code, which +must be distributed under the terms of Sections 1 and 2 above on a +medium customarily used for software interchange. + + If distribution of object code is made by offering access to copy +from a designated place, then offering equivalent access to copy the +source code from the same place satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at least + three years, to give the same user the materials specified in + Subsection 6a, above, for a charge no more than the cost of + performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be distributed need not include anything that is +normally distributed (in either source or binary form) with the major +components (compiler, kernel, and so on) of the operating system on +which the executable runs, unless that component itself accompanies +the executable. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library is void, and will automatically terminate your +rights under this License. However, parties who have received copies, +or rights, from you under this License will not have their licenses +terminated so long as such parties remain in full compliance. + + 9. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +subject to these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties with +this License. + + 11. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Library. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply, and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library under this License +may add an explicit geographical distribution limitation excluding those +countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser General Public License from time to time. +Such new versions will be similar in spirit to the present version, +but may differ in detail to address new problems or concerns. + +Each version is given a distinguishing version number. If the Library +specifies a version number of this License which applies to it and +"any later version", you have the option of following the terms and +conditions either of that version or of any later version published by +the Free Software Foundation. If the Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +write to the author to ask for permission. For software which is +copyrighted by the Free Software Foundation, write to the Free +Software Foundation; we sometimes make exceptions for this. Our +decision will be guided by the two goals of preserving the free status +of all derivatives of our free software and of promoting the sharing +and reuse of software generally. + + NO WARRANTY + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY +KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN +WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY +AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU +FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR +CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE +LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING +RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A +FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF +SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH +DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms +of the ordinary General Public License). + + To apply these terms, attach the following notices to the library. +It is safest to attach them to the start of each source file to most +effectively convey the exclusion of warranty; and each file should +have at least the "copyright" line and a pointer to where the full +notice is found. + + + + Copyright (C) + + This library 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; either + version 2.1 of the License, or (at your option) any later version. + + This library 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 library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or +your school, if any, to sign a "copyright disclaimer" for the library, +if necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James + Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/README.md b/README.md new file mode 100644 index 0000000..71e8d6a --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +connectionagent +=============== + +Connectionagent is a daemon and declarative plugin for accessing connman's UserAgent. It allows multiple access to UserAgent \ No newline at end of file diff --git a/connd/com.jollamobile.Connectiond.xml b/connd/com.jollamobile.Connectiond.xml new file mode 100644 index 0000000..0ffc03c --- /dev/null +++ b/connd/com.jollamobile.Connectiond.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/connd/conn.xml b/connd/conn.xml new file mode 100644 index 0000000..64de275 --- /dev/null +++ b/connd/conn.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/connd/connadaptor.cpp b/connd/connadaptor.cpp new file mode 100644 index 0000000..94a1d1e --- /dev/null +++ b/connd/connadaptor.cpp @@ -0,0 +1,49 @@ +/* + * This file was generated by qdbusxml2cpp version 0.7 + * Command line was: qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jolla.Connectiond.xml + * + * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). + * + * This is an auto-generated file. + * Do not edit! All changes made to it will be lost. + */ + +#include "connadaptor.h" +#include +#include +#include +#include +#include +#include +#include + +/* + * Implementation of adaptor class ConnAdaptor + */ + +ConnAdaptor::ConnAdaptor(QObject *parent) + : QDBusAbstractAdaptor(parent) +{ + // constructor + setAutoRelaySignals(true); +} + +ConnAdaptor::~ConnAdaptor() +{ + // destructor +} + +void ConnAdaptor::sendConnectReply(const QString &in0, int in1) +{ + qDebug() << Q_FUNC_INFO << in0 << in1; + // handle method call com.jolla.Connectiond.sendConnectReply + QMetaObject::invokeMethod(parent(), "sendConnectReply", Q_ARG(QString, in0), Q_ARG(int, in1)); +} + +void ConnAdaptor::sendUserReply(const QVariantMap &input) +{ + qDebug() << Q_FUNC_INFO << input; + // handle method call com.jolla.Connectiond.sendUserReply + QMetaObject::invokeMethod(parent(), "sendUserReply", Q_ARG(QVariantMap, input)); +} + diff --git a/connd/connadaptor.h b/connd/connadaptor.h new file mode 100644 index 0000000..b907f73 --- /dev/null +++ b/connd/connadaptor.h @@ -0,0 +1,72 @@ +/* + * This file was generated by qdbusxml2cpp version 0.7 + * Command line was: qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jolla.Connectiond.xml + * + * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). + * + * This is an auto-generated file. + * This file may have been hand-edited. Look for HAND-EDIT comments + * before re-generating it. + */ + +#ifndef CONNADAPTOR_H_1363412350 +#define CONNADAPTOR_H_1363412350 + +#include +#include +class QByteArray; +template class QList; +template class QMap; +class QString; +class QStringList; +class QVariant; + +/* + * Adaptor class for interface com.jolla.Connectiond + */ +class ConnAdaptor: public QDBusAbstractAdaptor +{ + Q_OBJECT + Q_CLASSINFO("D-Bus Interface", "com.jolla.Connectiond") + Q_CLASSINFO("D-Bus Introspection", "" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" +" \n" + "") +public: + ConnAdaptor(QObject *parent); + virtual ~ConnAdaptor(); + +public: // PROPERTIES +public Q_SLOTS: // METHODS + void sendConnectReply(const QString &in0, int in1); + void sendUserReply(const QVariantMap &input); +Q_SIGNALS: // SIGNALS + void connectionRequest(); + void errorReported(const QString &error); + void requestBrowser(const QString &url); + void userInputCanceled(); + void userInputRequested(const QString &service, const QVariantMap &fields); +}; + +#endif diff --git a/connd/connd.pro b/connd/connd.pro new file mode 100644 index 0000000..30576b5 --- /dev/null +++ b/connd/connd.pro @@ -0,0 +1,41 @@ + +QT += core network dbus gui +QT -= gui + +TARGET = connectionagent +CONFIG += console +CONFIG -= app_bundle + +TEMPLATE = app + +QT += core network dbus +QT -= gui + + +INCLUDEPATH += libconnman-qt + +OTHER_FILES += com.jolla.Connectiond.xml + +# create adaptor +system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jolla.Connectiond.xml) + +SOURCES += main.cpp \ + qconnectionmanager.cpp \ + connadaptor.cpp + + +HEADERS+= \ + qconnectionmanager.h \ + connadaptor.h + +LIBS += -lconnman-qt4 +# LIBS += -llipstick + +target.path = /usr/sbin +INSTALLS += target + +MOC_DIR=.moc +OBJECTS_DIR=.obj + + + diff --git a/connd/main.cpp b/connd/main.cpp new file mode 100644 index 0000000..d7a3c6b --- /dev/null +++ b/connd/main.cpp @@ -0,0 +1,82 @@ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include "qconnectionmanager.h" +#include "connadaptor.h" + +static void signal_handler(int signum) +{ + switch(signum) { + case SIGHUP: exit(EXIT_FAILURE); break; + case SIGTERM: exit(EXIT_SUCCESS); exit(0); break; + } +} + +static void daemonize(void) +{ + pid_t pid, sid; + int fd; + + if ( getppid() == 1 ) return; + + signal(SIGHUP,signal_handler); + signal(SIGTERM,signal_handler); + + pid = fork(); + if (pid < 0) { + exit(EXIT_FAILURE); + } + + if (pid > 0) { + exit(EXIT_SUCCESS); + } + + sid = setsid(); + if (sid < 0) { + exit(EXIT_FAILURE); + } + if ((chdir("/")) < 0) { + exit(EXIT_FAILURE); + } + + fd = open("/dev/null",O_RDWR, 0); + + if (fd != -1) { + dup2 (fd, STDIN_FILENO); + dup2 (fd, STDOUT_FILENO); + dup2 (fd, STDERR_FILENO); + + if (fd > 2) { + close (fd); + } + } + + umask(027); +} + +int main(int argc, char *argv[]) +{ + if (argc > 1) + if (strcmp(argv[1],"-d") == 0) { + daemonize(); + } + + QCoreApplication::setOrganizationName("Jolla Ltd"); + QCoreApplication::setOrganizationDomain("com.jollamobile"); + QCoreApplication::setApplicationName("connectionagent"); + QCoreApplication::setApplicationVersion("1.0"); + + QCoreApplication a(argc, argv); + + QConnectionManager::instance(); + + return a.exec(); +} + diff --git a/connd/qconnectionmanager.cpp b/connd/qconnectionmanager.cpp new file mode 100644 index 0000000..aaef575 --- /dev/null +++ b/connd/qconnectionmanager.cpp @@ -0,0 +1,226 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Jolla Ltd. +** Contact: lorn.potter@gmail.com +** + +** +** $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 "qconnectionmanager.h" +#include "connadaptor.h" + +#include +#include + +//#include +//#include +//#include +//#include + +#include +#include +#include + +//#include + +QConnectionManager* QConnectionManager::self = NULL; + +QConnectionManager::QConnectionManager(QObject *parent) : + QObject(parent), + netman(NetworkManagerFactory::createInstance()) +{ + connectionAdaptor = new ConnAdaptor(this); + QDBusConnection dbus = QDBusConnection::sessionBus(); + if (!dbus.registerObject("/Connectiond", this)) { + qDebug() << "XXXXXXXXXXX could not register object XXXXXXXXXXXXXXXXXX"; + } + if (!dbus.registerService("com.jolla.Connectiond")) { + qDebug() << "XXXXXXXXXXX could not register service XXXXXXXXXXXXXXXXXX"; + } + qDebug() << "XXXXXXXXXXX everything hunky dory XXXXXXXXXXXXXXXXXX"; + + ua = new UserAgent(this); + + connect(ua,SIGNAL(userInputRequested(QString,QVariantMap)), + this,SLOT(onUserInputRequested(QString,QVariantMap))); + + connect(ua,SIGNAL(connectionRequest()),this,SLOT(onConnectionRequest())); + connect(ua,SIGNAL(errorReported(QString)),this,SLOT(onErrorReported(QString))); + connect(ua,SIGNAL(userInputCanceled()),this,SLOT(onUserInputCanceled())); + connect(ua,SIGNAL(userInputRequested(QString,QVariantMap)), + this,SLOT(onUserInputRequested(QString,QVariantMap)), Qt::UniqueConnection); + + ua->sendConnectReply("Clear"); + + connect(netman,SIGNAL(serviceAdded(QString)),this,SLOT(onServiceAdded(QString))); + connect(netman,SIGNAL(stateChanged(QString)),this,SLOT(networkStateChanged(QString))); + currentNetworkState = netman->state(); +} + +QConnectionManager::~QConnectionManager() +{ + delete self; +} + +QConnectionManager & QConnectionManager::instance() +{ + if (!self) { + self = new QConnectionManager; + } + + return *self; +} + +// from useragent +void QConnectionManager::onUserInputRequested(const QString &servicePath, const QVariantMap &fields) +{ + // gets called when a connman service gets called to connect and needs more configurations. + + qDebug() << Q_FUNC_INFO;// << servicePath << fields; + Q_EMIT userInputRequested(servicePath, fields); +} + +// from useragent +void QConnectionManager::onUserInputCanceled() +{ + qDebug() << Q_FUNC_INFO; + Q_EMIT userInputCanceled(); +} + +// from useragent +void QConnectionManager::onErrorReported(const QString &error) +{ + qDebug() << Q_FUNC_INFO << error; + Q_EMIT errorReported(error); +} + +// from useragent +void QConnectionManager::onConnectionRequest() +{ + qDebug() << Q_FUNC_INFO; +// if (!autoConnect()) { + Q_EMIT connectionRequest(); + + // } +} + +void QConnectionManager::sendMessage() +{ + // ua->sendConnectReply(QLatin1String("Suppress")); +} + +void QConnectionManager::sendConnectReply(const QString &in0, int in1) +{ + qDebug() << Q_FUNC_INFO << in0 << in1; + ua->sendConnectReply(in0, in1); +} + +void QConnectionManager::sendUserReply(const QVariantMap &input) +{ + qDebug() << Q_FUNC_INFO; + ua->sendUserReply(input); +} + +void QConnectionManager::networkStateChanged(const QString &state) +{ + QString msg; + if (currentNetworkState == "idle" && state == "association") { + msg = "Connecting..."; + } else if (currentNetworkState == "ready" && state == "online") { + msg = "Connected"; + } else if (state == "offline") { + msg = "Offline"; + } + qDebug() << Q_FUNC_INFO << currentNetworkState << state << msg; + +// NotificationManager *manager = NotificationManager::instance(); +// QVariantHash hints; +// hints.insert(NotificationManager::HINT_URGENCY, 2); +// hints.insert(NotificationManager::HINT_CATEGORY, "device.error"); +// hints.insert(NotificationManager::HINT_PREVIEW_BODY, msg); +// manager->Notify(qApp->applicationName(), 0, QString(), QString(), QString(), QStringList(), hints, -1); + +// if (!msg.isEmpty()) { +// emit serviceStateChanged(msg); +// } + currentNetworkState = state; +} + +void QConnectionManager::onServiceAdded(const QString &servicePath) +{ +// qDebug() << Q_FUNC_INFO << servicePath; +} + +void QConnectionManager::serviceErrorChanged(const QString &error) +{ + qDebug() << Q_FUNC_INFO << error; +// NotificationManager *manager = NotificationManager::instance(); +// QVariantHash hints; +// hints.insert(NotificationManager::HINT_URGENCY, 1); +// hints.insert(NotificationManager::HINT_CATEGORY, "device.error"); +// hints.insert(NotificationManager::HINT_PREVIEW_BODY, error); +// manager->Notify(qApp->applicationName(), 0, QString(), QString(), QString(), QStringList(), hints, -1); +} + +void QConnectionManager::stateChanged(const QString &state) +{ + qDebug() << Q_FUNC_INFO << state; +} + +bool QConnectionManager::autoConnect() +{ + qDebug() << Q_FUNC_INFO; + QStringList techList = netman->technologiesList(); + Q_FOREACH (const QString &tech, techList) { + + QVector serviceList = netman->getServices(tech); + + Q_FOREACH (NetworkService *service, serviceList) { + if(service->autoConnect() && service->favorite()) { + + QObject::connect(service, SIGNAL(stateChanged(QString)), + this,SLOT(stateChanged(QString))); + QObject::connect(service, SIGNAL(connectRequestFailed(QString)), + this,SLOT(serviceErrorChanged(QString))); + + service->requestConnect(); + return true; + } + } + } + return false; +} + diff --git a/connd/qconnectionmanager.h b/connd/qconnectionmanager.h new file mode 100644 index 0000000..9be303d --- /dev/null +++ b/connd/qconnectionmanager.h @@ -0,0 +1,104 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Jolla Ltd. +** Contact: lorn.potter@gmail.com +** + +** +** $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$ +** +****************************************************************************/ + +#ifndef QCONNECTIONMANAGER_H +#define QCONNECTIONMANAGER_H + +#include +#include +#include +#include +#include +#include + +class UserAgent; +class SessionAgent; + +class ConnAdaptor; +class NetworkManager; + +class QConnectionManager : public QObject +{ + Q_OBJECT + +public: + ~QConnectionManager(); + + static QConnectionManager &instance(); + +Q_SIGNALS: + void connectionChanged(const QString &, bool); // ? + void connected(); // ? + + void userInputRequested(const QString &servicePath, const QVariantMap &fields); + void userInputCanceled(); + void errorReported(const QString &error); + void connectionRequest(); + +public Q_SLOTS: + + void onUserInputRequested(const QString &servicePath, const QVariantMap &fields); + void onUserInputCanceled(); + void onErrorReported(const QString &error); + + void onConnectionRequest(); + + void sendMessage();// ? + + void sendConnectReply(const QString &in0, int in1); + void sendUserReply(const QVariantMap &input); + + void networkStateChanged(const QString &state); + void onServiceAdded(const QString &servicePath); + void serviceErrorChanged(const QString &error); + void stateChanged(const QString &state); + +private: + explicit QConnectionManager(QObject *parent = 0); + static QConnectionManager *self; + ConnAdaptor *connectionAdaptor; + UserAgent *ua; + NetworkManager *netman; + bool autoConnect(); + QString currentNetworkState; +}; + +#endif // QCONNECTIONMANAGER_H diff --git a/connectionagent.pro b/connectionagent.pro new file mode 100644 index 0000000..7a6254c --- /dev/null +++ b/connectionagent.pro @@ -0,0 +1,17 @@ + +#------------------------------------------------- +# +# Project created by QtCreator 2011-05-11T09:46:44 +# +#------------------------------------------------- +TEMPLATE = subdirs + +#INCLUDEPATH += libconnman-qt +#DEPENDPATH += /home/lpotter/mer/builds/libconnman-qt-build/libconnman-qt +TEMPLATE += ordered + +#SUBDIRS = lib +SUBDIRS += connd +SUBDIRS += connectionagentplugin +SUBDIRS += test/testqml + diff --git a/connectionagent.pro.user b/connectionagent.pro.user new file mode 100644 index 0000000..d349692 --- /dev/null +++ b/connectionagent.pro.user @@ -0,0 +1,531 @@ + + + + + + ProjectExplorer.Project.ActiveTarget + 1 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + true + 1 + true + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + MerSDK-SailfishOS-i486-x86 + MerSDK-SailfishOS-i486-x86 + MerSDK-SailfishOS-i486-x86 + 0 + 0 + 0 + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /home/lpotter/mer/src/connectionagent + false + + + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + /home/lpotter/mer/src/connectionagent + false + + 2 + + + + true + Start Emulator, if necessary + + Mer.MerEmulatorCheckStep + + + + + + + + true + Upload files via SFTP + + RemoteLinux.DirectUploadStep + + + + + + true + + 2 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Copy Files to Device + + Qt4ProjectManager.MerSftpDeployConfiguration + + + + + false + rpm/connectionagent.yaml + /home/lpotter/SailfishOS/share/qtcreator/MerProject/mer-sdk-tools/MerSDK/SailfishOS-i486-x86/specify + /home/lpotter/mer/src/connectionagent + Custom Process Step + + ProjectExplorer.ProcessStep + + + true + -rf /home/mersdk/rpmbuild/RPMS/ + /home/lpotter/SailfishOS/share/qtcreator/MerProject/mer-sdk-tools/MerSDK/SailfishOS-i486-x86/rm + /home/lpotter/mer/src/connectionagent + Custom Process Step + + ProjectExplorer.ProcessStep + + + true + build -t MerSDK-SailfishOS-i486-x86 rpm/connectionagent.spec + /home/lpotter/SailfishOS/share/qtcreator/MerProject/mer-sdk-tools/MerSDK/SailfishOS-i486-x86/mb + /home/lpotter/mer/src/connectionagent + Custom Process Step + + ProjectExplorer.ProcessStep + + + true + -T /home/mersdk/rpmbuild/RPMS/*/* rpm/connectionagent-MerSDK-SailfishOS-i486-x86.rpm + /home/lpotter/SailfishOS/share/qtcreator/MerProject/mer-sdk-tools/MerSDK/SailfishOS-i486-x86/mv + /home/lpotter/mer/src/connectionagent + Custom Process Step + + ProjectExplorer.ProcessStep + + 4 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Install from RPM Package + Install from RPM Package + Qt4ProjectManager.MerRpmDeployConfiguration + + 2 + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + testqml (on Remote Device) + + Qt4ProjectManager.MerRunConfiguration:/home/lpotter/mer/src/connectionagent/test/testqml/testqml.pro + + 1 + test/testqml/testqml.pro + + + false + + 3768 + true + false + false + true + + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + connd (on Remote Device) + + Qt4ProjectManager.MerRunConfiguration:/home/lpotter/mer/src/connectionagent/connd/connd.pro + + 1 + connd/connd.pro + + + false + + 3768 + true + false + false + true + + 2 + + + + ProjectExplorer.Project.Target.1 + + Qt 4.8.2 (Qt-4.8.3) + Qt 4.8.2 (Qt-4.8.3) + {03277391-30ba-425a-9caa-11ac662d6cd3} + 0 + 0 + 0 + + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + false + + false + + + true + Make + + Qt4ProjectManager.MakeStep + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + /home/lpotter/mer/src/connectionagent-build-4_8_3-Default_build_Release + true + + 1 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy locally + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + testqml + + Qt4ProjectManager.Qt4RunConfiguration:/home/lpotter/mer/src/connectionagent/test/testqml/testqml.pro + 2 + + test/testqml/testqml.pro + false + false + + + 3768 + true + false + false + true + + + true + + false + false + false + false + true + 0.01 + 10 + true + 25 + + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + connd + + Qt4ProjectManager.Qt4RunConfiguration:/home/lpotter/mer/src/connectionagent/connd/connd.pro + 2 + + connd/connd.pro + false + true + + + 3768 + true + false + false + true + + 2 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.EnvironmentId + {618d4a1a-62e2-4b5f-8f73-16b2dabb1fbf} + + + ProjectExplorer.Project.Updater.FileVersion + 12 + + diff --git a/connectionagentplugin/connectionagentplugin.cpp b/connectionagentplugin/connectionagentplugin.cpp new file mode 100644 index 0000000..468c144 --- /dev/null +++ b/connectionagentplugin/connectionagentplugin.cpp @@ -0,0 +1,114 @@ +#include "connectionagentplugin.h" +#include "connectionamanagerinterface.h" + +#include + +#define CONND_SERVICE "com.jolla.Connectiond" +#define CONND_PATH "/Connectiond" + +ConnectionAgentPlugin::ConnectionAgentPlugin(QObject *parent): + QObject(parent) +{ + qDebug() << Q_FUNC_INFO << "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX" << this; + + connectiondWatcher = new QDBusServiceWatcher(CONND_SERVICE,QDBusConnection::sessionBus(), + QDBusServiceWatcher::WatchForRegistration | + QDBusServiceWatcher::WatchForUnregistration, this); + + connect(connectiondWatcher, SIGNAL(serviceRegistered(QString)), + this, SLOT(connectToConnectiond(QString))); + connect(connectiondWatcher, SIGNAL(serviceUnregistered(QString)), + this, SLOT(connectiondUnregistered(QString))); + + bool available = QDBusConnection::sessionBus().interface()->isServiceRegistered(CONND_SERVICE); + + if(available) { + connectToConnectiond(); + qDebug() << Q_FUNC_INFO << CONND_SERVICE << "success!!"; + } else { + qDebug() << Q_FUNC_INFO << CONND_SERVICE << "not available"; + } +} + +ConnectionAgentPlugin::~ConnectionAgentPlugin() +{ +} + +void ConnectionAgentPlugin::sendUserReply(const QVariantMap &input) +{ + qDebug() << Q_FUNC_INFO << this << sender(); + QDBusPendingReply<> reply = connManagerInterface->sendUserReply(input); + if (reply.isError()) { + qDebug() << Q_FUNC_INFO << reply.error().message(); + } +} + +void ConnectionAgentPlugin::sendConnectReply(const QString &replyMessage, int timeout) +{ + qDebug() << Q_FUNC_INFO << replyMessage << timeout; + connManagerInterface->sendConnectReply(replyMessage,timeout); +} + +void ConnectionAgentPlugin::onErrorReported(const QString &error) +{ + qDebug() << Q_FUNC_INFO << error; + Q_EMIT errorReported(error); +} + +void ConnectionAgentPlugin::onRequestBrowser(const QString &url) +{ + qDebug() << Q_FUNC_INFO < i(fields); + // this works for Passphrase at least. anything else? + while (i.hasNext()) { + i.next(); + QDBusArgument arg = fields.value(i.key()).value(); + QVariantMap vmap = qdbus_cast(arg); + map.insert(i.key(), vmap); + } + Q_EMIT userInputRequested(service, map); +} + +void ConnectionAgentPlugin::onConnectionRequested() +{ + qDebug() << Q_FUNC_INFO; + Q_EMIT connectionRequest(); +} + +void ConnectionAgentPlugin::connectToConnectiond(QString) +{ + if (connManagerInterface) { + delete connManagerInterface; + connManagerInterface = 0; + } + connManagerInterface = new com::jolla::Connectiond(CONND_SERVICE, CONND_PATH, QDBusConnection::sessionBus(), this); + + connect(connManagerInterface,SIGNAL(connectionRequest()), + this,SLOT(onConnectionRequested())); + connect(connManagerInterface,SIGNAL(userInputCanceled()), + this,SIGNAL(userInputCanceled())); + + connect(connManagerInterface,SIGNAL(errorReported(QString)), + this,SLOT(onErrorReported(QString))); + + connect(connManagerInterface,SIGNAL(requestBrowser(QString)), + this,SLOT(onRequestBrowser(QString))); + + connect(connManagerInterface,SIGNAL(userInputRequested(QString,QVariantMap)), + this,SLOT(onUserInputRequested(QString,QVariantMap)), Qt::UniqueConnection); +} + +void ConnectionAgentPlugin::connectiondUnregistered(QString) +{ + if (connManagerInterface) { + delete connManagerInterface; + connManagerInterface = 0; + } +} diff --git a/connectionagentplugin/connectionagentplugin.h b/connectionagentplugin/connectionagentplugin.h new file mode 100644 index 0000000..1bace44 --- /dev/null +++ b/connectionagentplugin/connectionagentplugin.h @@ -0,0 +1,43 @@ +#ifndef CONNECTIONAGENTPLUGIN_H +#define CONNECTIONAGENTPLUGIN_H + +#include +#include "connectionagentplugin.h" +#include "connectionamanagerinterface.h" + +class ConnectionAgentPlugin : public QObject +{ + Q_OBJECT + // Q_DISABLE_COPY(ConnectionAgentPlugin) + +public: + ConnectionAgentPlugin(QObject *parent = 0); + ~ConnectionAgentPlugin(); + +public slots: + void sendUserReply(const QVariantMap &input); + void sendConnectReply(const QString &replyMessage, int timeout = 120); + +signals: + void userInputRequested(const QString &servicePath, const QVariantMap &fields); + void userInputCanceled(); + void errorReported(const QString &error); + void connectionRequest(); + +// void userConnectRequested(const QDBusMessage &message); +private: + com::jolla::Connectiond *connManagerInterface; + QDBusServiceWatcher *connectiondWatcher; + +private slots: + void onErrorReported(const QString &error); + void onRequestBrowser(const QString &url); + void onUserInputRequested(const QString &service, const QVariantMap &fields); + void onConnectionRequested(); + + void connectToConnectiond(const QString = QString()); + void connectiondUnregistered(const QString = QString()); +}; + +#endif // CONNECTIONAGENTPLUGIN_H + diff --git a/connectionagentplugin/connectionagentplugin.pro b/connectionagentplugin/connectionagentplugin.pro new file mode 100644 index 0000000..173794d --- /dev/null +++ b/connectionagentplugin/connectionagentplugin.pro @@ -0,0 +1,27 @@ +TEMPLATE = lib +TARGET = connectionagentplugin +QT += declarative dbus +CONFIG += qt plugin + +uri = com.jolla.connection + +#create client +#system(qdbusxml2cpp ../connd/com.jolla.Connectiond.xml -c ConnectionManagerInterface -p connectionamanagerinterface) + +SOURCES += \ + connectionagentplugin_plugin.cpp \ + connectionagentplugin.cpp \ + connectionamanagerinterface.cpp + +HEADERS += \ + connectionagentplugin_plugin.h \ + connectionagentplugin.h \ + connectionamanagerinterface.h + +OTHER_FILES = qmldir + +target.path = $$[QT_INSTALL_IMPORTS]/com/jolla/connection +qmldir.files += qmldir +qmldir.path = $$[QT_INSTALL_IMPORTS]/com/jolla/connection + +INSTALLS += target qmldir diff --git a/connectionagentplugin/connectionagentplugin_plugin.cpp b/connectionagentplugin/connectionagentplugin_plugin.cpp new file mode 100644 index 0000000..2f9a327 --- /dev/null +++ b/connectionagentplugin/connectionagentplugin_plugin.cpp @@ -0,0 +1,15 @@ +#include "connectionagentplugin_plugin.h" +#include "connectionagentplugin.h" + +#include + +void ConnectionagentpluginPlugin::registerTypes(const char *uri) +{ + qDebug() << Q_FUNC_INFO << uri; + // @uri com.jolla.connection + qmlRegisterType(uri, 1, 0, "ConnectionAgent"); +} + +#if QT_VERSION < 0x050000 +Q_EXPORT_PLUGIN2(Connectionagentplugin, ConnectionagentpluginPlugin) +#endif diff --git a/connectionagentplugin/connectionagentplugin_plugin.h b/connectionagentplugin/connectionagentplugin_plugin.h new file mode 100644 index 0000000..90d8d6a --- /dev/null +++ b/connectionagentplugin/connectionagentplugin_plugin.h @@ -0,0 +1,19 @@ +#ifndef CONNECTIONAGENTPLUGIN_PLUGIN_H +#define CONNECTIONAGENTPLUGIN_PLUGIN_H + +#include + +class ConnectionagentpluginPlugin : public QDeclarativeExtensionPlugin +{ + Q_OBJECT +#if QT_VERSION >= 0x050000 + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface") +#endif + +public: + void registerTypes(const char *uri); + +}; + +#endif // CONNECTIONAGENTPLUGIN_PLUGIN_H + diff --git a/connectionagentplugin/connectionamanagerinterface.cpp b/connectionagentplugin/connectionamanagerinterface.cpp new file mode 100644 index 0000000..e5909be --- /dev/null +++ b/connectionagentplugin/connectionamanagerinterface.cpp @@ -0,0 +1,26 @@ +/* + * This file was generated by qdbusxml2cpp version 0.7 + * Command line was: qdbusxml2cpp ../connd/com.jolla.Connectiond.xml -c ConnectionManagerInterface -p connectionamanagerinterface + * + * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). + * + * This is an auto-generated file. + * This file may have been hand-edited. Look for HAND-EDIT comments + * before re-generating it. + */ + +#include "connectionamanagerinterface.h" + +/* + * Implementation of interface class ConnectionManagerInterface + */ + +ConnectionManagerInterface::ConnectionManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) + : QDBusAbstractInterface(service, path, staticInterfaceName(), connection, parent) +{ +} + +ConnectionManagerInterface::~ConnectionManagerInterface() +{ +} + diff --git a/connectionagentplugin/connectionamanagerinterface.h b/connectionagentplugin/connectionamanagerinterface.h new file mode 100644 index 0000000..24e0673 --- /dev/null +++ b/connectionagentplugin/connectionamanagerinterface.h @@ -0,0 +1,67 @@ +/* + * This file was generated by qdbusxml2cpp version 0.7 + * Command line was: qdbusxml2cpp ../connd/com.jolla.Connectiond.xml -c ConnectionManagerInterface -p connectionamanagerinterface + * + * qdbusxml2cpp is Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). + * + * This is an auto-generated file. + * Do not edit! All changes made to it will be lost. + */ + +#ifndef CONNECTIONAMANAGERINTERFACE_H_1363426405 +#define CONNECTIONAMANAGERINTERFACE_H_1363426405 + +#include +#include +#include +#include +#include +#include +#include +#include + +/* + * Proxy class for interface com.jolla.Connectiond + */ +class ConnectionManagerInterface: public QDBusAbstractInterface +{ + Q_OBJECT +public: + static inline const char *staticInterfaceName() + { return "com.jolla.Connectiond"; } + +public: + ConnectionManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + + ~ConnectionManagerInterface(); + +public Q_SLOTS: // METHODS + inline QDBusPendingReply<> sendConnectReply(const QString &in0, int in1) + { + QList argumentList; + argumentList << QVariant::fromValue(in0) << QVariant::fromValue(in1); + return asyncCallWithArgumentList(QLatin1String("sendConnectReply"), argumentList); + } + + inline QDBusPendingReply<> sendUserReply(const QVariantMap &input) + { + qDebug() << Q_FUNC_INFO; + QList argumentList; + argumentList << QVariant::fromValue(input); + return asyncCallWithArgumentList(QLatin1String("sendUserReply"), argumentList); + } + +Q_SIGNALS: // SIGNALS + void connectionRequest(); + void errorReported(const QString &error); + void requestBrowser(const QString &url); + void userInputCanceled(); + void userInputRequested(const QString &service, const QVariantMap &fields); +}; + +namespace com { + namespace jolla { + typedef ::ConnectionManagerInterface Connectiond; + } +} +#endif diff --git a/connectionagentplugin/qmldir b/connectionagentplugin/qmldir new file mode 100644 index 0000000..719102b --- /dev/null +++ b/connectionagentplugin/qmldir @@ -0,0 +1,2 @@ +plugin connectionagentplugin + diff --git a/makedist b/makedist new file mode 100755 index 0000000..167ccdb --- /dev/null +++ b/makedist @@ -0,0 +1,53 @@ +#!/bin/bash + + + + +# Determine project name based on current directory +#PROJECT=$(basename $PWD) +PROJECT=sensorfw + +# NOTE: Don't like this? Then uncomment one of the following as appropriate +# +# Just set it explictly to whatever you like: +# PROJECT=libseaside +# +# Parse it from any Qt *.pro or *.pri files in CWD: +# PROJECT=$(grep -E "TARGET ?= ?" *.pr[io]|cut -d' ' -f3) + +while getopts ht: o +do case $o in + h) head=1;; + t) TAG="$OPTARG";; + ?) printf >&2 "Usage: $0 [-h] [-t TAG]\n" + exit 2;; + esac +done + +# Grab most recent tag from git unless TAG is set +if [ -z "$TAG" ] ; then + TAG=$(git describe --tags --abbrev=0) +fi + +# Parse out just the version number +#PARTS=(${TAG//-/ }) +#VERSION=${PARTS[1]} +VERSION=${TAG} + +# Set name of toplevel directory for the archive +PREFIX="${PROJECT}-${VERSION}/" + +# Set name of resulting release archive file +ARCHIVE=${PROJECT}-${VERSION}.tar.bz2 + +[ -e ${ARCHIVE} ] && rm -rf ${ARCHIVE} && echo "Removed: ${ARCHIVE}" + +if [ ! -z "$head" ] ; then + TAG="HEAD" +fi + +git archive --format=tar --prefix=${PREFIX} $TAG | bzip2 -c -- > ${ARCHIVE} && { + echo "Created: ${ARCHIVE}" +} || { + echo "Creation of release archive ${ARCHIVE} failed. Reason unknown." +} diff --git a/rpm/connectionagent.conf b/rpm/connectionagent.conf new file mode 100644 index 0000000..7871fdc --- /dev/null +++ b/rpm/connectionagent.conf @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/rpm/connectionagent.service b/rpm/connectionagent.service new file mode 100644 index 0000000..8d7de29 --- /dev/null +++ b/rpm/connectionagent.service @@ -0,0 +1,12 @@ +[Unit] +Description=Connection daemon for connman UserAgent +Requires=dbus.socket dbus.service + +[Service] +ExecStart=/usr/bin/connectionagent +Restart=always +BusName=com.jolla.Connectiond +Type=dbus + +[Install] +WantedBy=jolla-middleware.target \ No newline at end of file diff --git a/rpm/connectionagent.yaml b/rpm/connectionagent.yaml new file mode 100644 index 0000000..01781ed --- /dev/null +++ b/rpm/connectionagent.yaml @@ -0,0 +1,36 @@ +Name: Connection Agent +Summary: User Agent daemon +Version: 0.1 +Release: 0 +Group: "System/ConnectionAgent" +License: LGPLv2+ +URL: http://gitorious.org/connectionagent +Description: | + Connection Agent provides multi user access to connman's User Agent. +Sources: + - "%{name}-%{version}.tar.bz2" + - "connectionagent.service" +Requires: + - qt + - qt-dbus + +PkgConfigBR: + - QtCore + - QtDBus + +Configure: none +Builder: qmake +UseAsNeeded: no + +QMakeOptions: + +SubPackages: + - Name: declarative + Summary: Declarative plugin for connection agent. + Group: Development/Tools + Description: This package contains the declarative plugin for connection agent. + Requires: + - "%{name} = %{version}" + Files: + - "%{_libdir}/qt4/imports/com/jolla/connection/*" + diff --git a/test/testqml/cover/CoverPage.qml b/test/testqml/cover/CoverPage.qml new file mode 100644 index 0000000..f79d507 --- /dev/null +++ b/test/testqml/cover/CoverPage.qml @@ -0,0 +1,27 @@ +import QtQuick 1.1 +import Sailfish.Silica 1.0 + +Rectangle { + anchors.fill: parent + color: "black" + + Label { + id: label + anchors.centerIn: parent + text: "My Cover" + } + + CoverActionList { + id: coverAction + + CoverAction { + iconSource: "image://theme/icon-cover-next" + } + + CoverAction { + iconSource: "image://theme/icon-cover-pause" + } + } +} + + diff --git a/test/testqml/main.cpp b/test/testqml/main.cpp new file mode 100644 index 0000000..718baa2 --- /dev/null +++ b/test/testqml/main.cpp @@ -0,0 +1,17 @@ + +#include +#include + +#include "sailfishapplication.h" + +Q_DECL_EXPORT int main(int argc, char *argv[]) +{ + QScopedPointer app(Sailfish::createApplication(argc, argv)); + QScopedPointer view(Sailfish::createView("main.qml")); + + Sailfish::showView(view.data()); + + return app->exec(); +} + + diff --git a/test/testqml/main.qml b/test/testqml/main.qml new file mode 100644 index 0000000..4099cb2 --- /dev/null +++ b/test/testqml/main.qml @@ -0,0 +1,29 @@ +import QtQuick 1.1 +import Sailfish.Silica 1.0 +//import "pages" +import com.jolla.connection 1.0 + +ApplicationWindow +{ + // initialPage: FirstPage { } + cover: Qt.resolvedUrl("cover/CoverPage.qml") + Label { + id: label + anchors.fill: parent + } + + ConnectionAgent { + id: connagent + + onConnectionRequest: { + console.log("connection request") + label.text = "connection request" + } + onUserInputRequested: { + label.text = "user input request" + console.log("userInput") + } + } +} + + diff --git a/test/testqml/pages/FirstPage.qml b/test/testqml/pages/FirstPage.qml new file mode 100644 index 0000000..47836e8 --- /dev/null +++ b/test/testqml/pages/FirstPage.qml @@ -0,0 +1,40 @@ +import QtQuick 1.1 +import Sailfish.Silica 1.0 + +Page { + id: page + + // To enable PullDownMenu, place our content in a SilicaFlickable + SilicaFlickable { + anchors.fill: parent + + // PullDownMenu and PushUpMenu must be declared in SilicaFlickable, SilicaListView or SilicaGridView + PullDownMenu { + MenuItem { + text: "Show Page 2" + onClicked: pageStack.push(Qt.resolvedUrl("SecondPage.qml")) + } + } + + // Tell SilicaFlickable the height of its content. + contentHeight: childrenRect.height + + // Place our content in a Column. The PageHeader is always placed at the top + // of the page, followed by our content. + Column { + width: page.width + spacing: theme.paddingLarge + PageHeader { + title: "UI Template" + } + Label { + x: theme.paddingLarge + text: "Hello Sailors" + color: theme.secondaryHighlightColor + font.pixelSize: theme.fontSizeLarge + } + } + } +} + + diff --git a/test/testqml/pages/SecondPage.qml b/test/testqml/pages/SecondPage.qml new file mode 100644 index 0000000..ab0b9d3 --- /dev/null +++ b/test/testqml/pages/SecondPage.qml @@ -0,0 +1,26 @@ +import QtQuick 1.1 +import Sailfish.Silica 1.0 + +Page { + id: page + SilicaListView { + id: listView + model: 20 + anchors.fill: parent + header: PageHeader { + title: "Nested Page" + } + delegate: BackgroundItem { + Label { + x: theme.paddingLarge + text: "Item " + index + } + onClicked: console.log("Clicked " + index) + } + } +} + + + + + diff --git a/test/testqml/rpm/testqml.yaml b/test/testqml/rpm/testqml.yaml new file mode 100644 index 0000000..4a35b74 --- /dev/null +++ b/test/testqml/rpm/testqml.yaml @@ -0,0 +1,31 @@ +Name: testqml +Summary: My SailfishOS Application +Version: 0.1 +Release: 1 +Group: Qt/Qt +License: LICENSE +Sources: + - "%{name}-%{version}.tar.bz2" +Description: | + Short description of my SailfishOS Application +# Qt Applications generally don't use configure and do use qmake +Configure: none +Builder: qmake +# pkgconfigs we depend on to build +PkgConfigBR: + - "" +# Packages we depend on to build +PkgBR: + - "" +# Packages we require to run +Requires: + - "" +Files: + - "/opt" + + + +# This is a spectacle file. +# It is a yaml file that uses specify to manage the spec file used to package the application. +# See https://wiki.merproject.org/wiki/Spectacle for more information + diff --git a/test/testqml/sailfishapplication/sailfishapplication.cpp b/test/testqml/sailfishapplication/sailfishapplication.cpp new file mode 100644 index 0000000..ec8e512 --- /dev/null +++ b/test/testqml/sailfishapplication/sailfishapplication.cpp @@ -0,0 +1,74 @@ + +#include +#include +#include + +#ifdef DESKTOP +#include +#endif + +#include +#include +#include +#include + +#ifdef HAS_BOOSTER +#include +#endif + +#include "sailfishapplication.h" + +QApplication *Sailfish::createApplication(int &argc, char **argv) +{ +#ifdef HAS_BOOSTER + return MDeclarativeCache::qApplication(argc, argv); +#else + return new QApplication(argc, argv); +#endif +} + +QDeclarativeView *Sailfish::createView(const QString &file) +{ + QDeclarativeView *view; +#ifdef HAS_BOOSTER + view = MDeclarativeCache::qDeclarativeView(); +#else + view = new QDeclarativeView; +#endif + + bool isDesktop = qApp->arguments().contains("-desktop"); + + QString path; + if (isDesktop) { + path = qApp->applicationDirPath() + QDir::separator(); +#ifdef DESKTOP + view->setViewport(new QGLWidget); +#endif + } else { + path = QString(DEPLOYMENT_PATH); + } + view->setSource(QUrl::fromLocalFile(path + file)); + + return view; +} + +void Sailfish::showView(QDeclarativeView* view) { + view->setResizeMode(QDeclarativeView::SizeRootObjectToView); + + bool isDesktop = qApp->arguments().contains("-desktop"); + + if (isDesktop) { + view->setFixedSize(480, 854); + view->rootObject()->setProperty("_desktop", true); + view->show(); + } else { + view->setAttribute(Qt::WA_OpaquePaintEvent); + view->setAttribute(Qt::WA_NoSystemBackground); + view->viewport()->setAttribute(Qt::WA_OpaquePaintEvent); + view->viewport()->setAttribute(Qt::WA_NoSystemBackground); + + view->showFullScreen(); + } +} + + diff --git a/test/testqml/sailfishapplication/sailfishapplication.h b/test/testqml/sailfishapplication/sailfishapplication.h new file mode 100644 index 0000000..e8cd901 --- /dev/null +++ b/test/testqml/sailfishapplication/sailfishapplication.h @@ -0,0 +1,18 @@ + +#ifndef SAILFISHAPPLICATION_H +#define SAILFISHAPPLICATION_H + +class QString; +class QApplication; +class QDeclarativeView; + +namespace Sailfish { + +QApplication *createApplication(int &argc, char **argv); +QDeclarativeView *createView(const QString &); +void showView(QDeclarativeView* view); + +} + +#endif // SAILFISHAPPLICATION_H + diff --git a/test/testqml/sailfishapplication/sailfishapplication.pri b/test/testqml/sailfishapplication/sailfishapplication.pri new file mode 100644 index 0000000..eef2e7f --- /dev/null +++ b/test/testqml/sailfishapplication/sailfishapplication.pri @@ -0,0 +1,34 @@ +QT += declarative + +SOURCES += $$PWD/sailfishapplication.cpp +HEADERS += $$PWD/sailfishapplication.h +INCLUDEPATH += $$PWD + +TARGETPATH = /opt/sdk/bin +target.path = $$TARGETPATH + +DEPLOYMENT_PATH = /opt/sdk/share/$$TARGET +qml.path = $$DEPLOYMENT_PATH +desktop.path = /opt/sdk/share/applications + +contains(CONFIG, desktop) { + DEFINES *= DESKTOP + QT += opengl +} + +INSTALLS += target qml desktop + +DEFINES += DEPLOYMENT_PATH=\"\\\"\"$${DEPLOYMENT_PATH}/\"\\\"\" + +CONFIG += link_pkgconfig +packagesExist(qdeclarative-boostable) { + message("Building with qdeclarative-boostable support") + DEFINES += HAS_BOOSTER + PKGCONFIG += qdeclarative-boostable +} else { + warning("qdeclarative-boostable not available; startup times will be slower") +} + + + + diff --git a/test/testqml/testqml.desktop b/test/testqml/testqml.desktop new file mode 100644 index 0000000..507115d --- /dev/null +++ b/test/testqml/testqml.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=testqml +Icon=icon-launcher-gallery +Exec=invoker --type=j -s /opt/sdk/bin/testqml +Comment=Sailfish UI application + + diff --git a/test/testqml/testqml.pro b/test/testqml/testqml.pro new file mode 100644 index 0000000..fa42e3e --- /dev/null +++ b/test/testqml/testqml.pro @@ -0,0 +1,20 @@ +# The name of your app +TARGET = testqml + +# C++ sources +SOURCES += main.cpp + +# C++ headers +HEADERS += + +# QML files and folders +qml.files = *.qml pages cover main.qml + +# The .desktop file +desktop.files = testqml.desktop + +# Please do not modify the following line. +include(sailfishapplication/sailfishapplication.pri) + +OTHER_FILES = rpm/testqml.yaml + diff --git a/test/testqml/testqml2.qml b/test/testqml/testqml2.qml new file mode 100644 index 0000000..7638957 --- /dev/null +++ b/test/testqml/testqml2.qml @@ -0,0 +1,17 @@ +import QtQuick 1.1 +import Sailfish.Silica 1.0 +import jolla.connection 1.0 + +Rectangle { + width: 100 + height: 62 +Text { + +anchors.fill: parent.fill +} +ConnectionAgent: { + + onConnectionRequest { + console.log("connection request") + } +}