projects
/
googlelatitude
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b58ae22
)
Prepare for ovi store
author
Developer
<developer@virtu.(none)>
Sun, 11 Sep 2011 23:02:16 +0000
(
01:02
+0200)
committer
Developer
<developer@virtu.(none)>
Sun, 11 Sep 2011 23:02:16 +0000
(
01:02
+0200)
13 files changed:
latitude.qml/latitude.qml.pro
patch
|
blob
|
history
latitude.qml/main.cpp
patch
|
blob
|
history
latitude.qt/latitude.qt.pro
patch
|
blob
|
history
latituded/latituded.pro
patch
|
blob
|
history
latitudeupdater_harmattan.desktop
patch
|
blob
|
history
libkqoauth/libkqoauth.pro
patch
|
blob
|
history
liblatitudeupdater/googlelatitude.cpp
patch
|
blob
|
history
liblatitudeupdater/gpscontrol.cpp
patch
|
blob
|
history
liblatitudeupdater/liblatitudeupdater.pro
patch
|
blob
|
history
liblocationmaemo5/liblocationmaemo5.pro
patch
|
blob
|
history
qtc_packaging/debian_harmattan/control
patch
|
blob
|
history
qtc_packaging/debian_harmattan/googlelatitude.aegis
[deleted file]
patch
|
blob
|
history
qtc_packaging/debian_harmattan/latitudeupdater.aegis
[new file with mode: 0644]
patch
|
blob
diff --git
a/latitude.qml/latitude.qml.pro
b/latitude.qml/latitude.qml.pro
index
2635e0d
..
0f4b557
100644
(file)
--- a/
latitude.qml/latitude.qml.pro
+++ b/
latitude.qml/latitude.qml.pro
@@
-1,7
+1,5
@@
TEMPLATE = app
TARGET = latitude.qml
TEMPLATE = app
TARGET = latitude.qml
-target.path = /opt/linfati.com/bin/
-INSTALLS += target
QT += network
CONFIG += mobility
QT += network
CONFIG += mobility
@@
-20,7
+18,5
@@
SOURCES += qml.cpp main.cpp
RESOURCES += resouses.qrc
OTHER_FILES += main.qml MainPage.qml
RESOURCES += resouses.qrc
OTHER_FILES += main.qml MainPage.qml
-# enable booster
-CONFIG += qdeclarative-boostable
-QMAKE_CXXFLAGS += -fPIC -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_LFLAGS += -pie -rdynamic
+include(../deployment.pri)
+qtcAddDeployment()
diff --git
a/latitude.qml/main.cpp
b/latitude.qml/main.cpp
index
1614a09
..
bce7fda
100644
(file)
--- a/
latitude.qml/main.cpp
+++ b/
latitude.qml/main.cpp
@@
-1,7
+1,7
@@
#include <QtGui/QApplication>
#include "qml.h"
#include <QtGui/QApplication>
#include "qml.h"
-Q_DECL_EXPORT int main(int argc, char *argv[]) {
+int main(int argc, char *argv[]) {
qDebug() << "* Main QML";
QCoreApplication::setOrganizationName("linfati.com");
QCoreApplication::setOrganizationDomain("linfati.com");
qDebug() << "* Main QML";
QCoreApplication::setOrganizationName("linfati.com");
QCoreApplication::setOrganizationDomain("linfati.com");
diff --git
a/latitude.qt/latitude.qt.pro
b/latitude.qt/latitude.qt.pro
index
ba96b9b
..
e4effe0
100644
(file)
--- a/
latitude.qt/latitude.qt.pro
+++ b/
latitude.qt/latitude.qt.pro
@@
-1,7
+1,5
@@
TEMPLATE = app
TARGET = latitude.qt
TEMPLATE = app
TARGET = latitude.qt
-target.path = /opt/linfati.com/bin/
-INSTALLS += target
QT += network
CONFIG += mobility
QT += network
CONFIG += mobility
@@
-16,3
+14,6
@@
LIBS += ../libkqoauth/libkqoauth.a
HEADERS += widget.h
SOURCES += widget.cpp main.cpp
HEADERS += widget.h
SOURCES += widget.cpp main.cpp
+
+include(../deployment.pri)
+qtcAddDeployment()
diff --git
a/latituded/latituded.pro
b/latituded/latituded.pro
index
111a573
..
eddda0c
100644
(file)
--- a/
latituded/latituded.pro
+++ b/
latituded/latituded.pro
@@
-1,7
+1,5
@@
TEMPLATE = app
TARGET = latituded
TEMPLATE = app
TARGET = latituded
-target.path = /opt/linfati.com/bin/
-INSTALLS += target
QT += network
CONFIG += mobility
QT += network
CONFIG += mobility
@@
-16,3
+14,6
@@
LIBS += ../libkqoauth/libkqoauth.a
HEADERS += daemon.h
SOURCES += daemon.cpp main.cpp
HEADERS += daemon.h
SOURCES += daemon.cpp main.cpp
+
+include(../deployment.pri)
+qtcAddDeployment()
diff --git
a/latitudeupdater_harmattan.desktop
b/latitudeupdater_harmattan.desktop
index
3b961bc
..
98355d0
100644
(file)
--- a/
latitudeupdater_harmattan.desktop
+++ b/
latitudeupdater_harmattan.desktop
@@
-4,7
+4,7
@@
Version=1.0
Type=Application
Terminal=false
Name=LatitudeUpdater
Type=Application
Terminal=false
Name=LatitudeUpdater
-Exec=/usr/bin/invoker --single-instance --type=d /opt/linfati.com/bin/latitude.qml
+Exec=/usr/bin/invoker --single-instance --type=e /opt/linfati.com/bin/latitude.qml
Icon=/usr/share/icons/hicolor/80x80/apps/latitudeupdater80.png
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
Icon=/usr/share/icons/hicolor/80x80/apps/latitudeupdater80.png
X-Window-Icon=
X-HildonDesk-ShowInToolbar=true
diff --git
a/libkqoauth/libkqoauth.pro
b/libkqoauth/libkqoauth.pro
index
4b8e4ca
..
dcd230f
100644
(file)
--- a/
libkqoauth/libkqoauth.pro
+++ b/
libkqoauth/libkqoauth.pro
@@
-21,6
+21,3
@@
SOURCES += kqoauthauthreplyserver.cpp \
kqoauthrequest_1.cpp \
kqoauthrequest_xauth.cpp \
kqoauthutils.cpp
kqoauthrequest_1.cpp \
kqoauthrequest_xauth.cpp \
kqoauthutils.cpp
-
-include(../deployment.pri)
-qtcAddDeployment()
diff --git
a/liblatitudeupdater/googlelatitude.cpp
b/liblatitudeupdater/googlelatitude.cpp
index
47e90c5
..
d111370
100644
(file)
--- a/
liblatitudeupdater/googlelatitude.cpp
+++ b/
liblatitudeupdater/googlelatitude.cpp
@@
-141,7
+141,7
@@
void GoogleLatitude::setAutoConnect(bool status) {
bool GoogleLatitude::getAutoConnect() {
qDebug() << "* GoogleLatitude::getAutoConnect";
bool GoogleLatitude::getAutoConnect() {
qDebug() << "* GoogleLatitude::getAutoConnect";
- return OauthSettings.value("net_auto").toBool();
+ return OauthSettings.value("net_auto", true).toBool();
}
void GoogleLatitude::onTemporaryTokenReceived(QString temporaryToken, QString temporaryTokenSecret) {
}
void GoogleLatitude::onTemporaryTokenReceived(QString temporaryToken, QString temporaryTokenSecret) {
diff --git
a/liblatitudeupdater/gpscontrol.cpp
b/liblatitudeupdater/gpscontrol.cpp
index
2b900c9
..
7b9addd
100644
(file)
--- a/
liblatitudeupdater/gpscontrol.cpp
+++ b/
liblatitudeupdater/gpscontrol.cpp
@@
-13,7
+13,7
@@
GpsControl::GpsControl(QObject *parent) :
GpsTimeout.setSingleShot(true);
GpsInterval.setSingleShot(true);
GpsTimeout.setSingleShot(true);
GpsInterval.setSingleShot(true);
- setPositioningMethod(GpsSettings.value("gps_method", "cell").toString());
+ setPositioningMethod(GpsSettings.value("gps_method", "all").toString());
setTimeOut(GpsSettings.value("gps_timeout", 60).toInt());
setInterval(GpsSettings.value("gps_interval", 15*60).toInt());
setTimeOut(GpsSettings.value("gps_timeout", 60).toInt());
setInterval(GpsSettings.value("gps_interval", 15*60).toInt());
diff --git
a/liblatitudeupdater/liblatitudeupdater.pro
b/liblatitudeupdater/liblatitudeupdater.pro
index
48d5c06
..
0d097c8
100644
(file)
--- a/
liblatitudeupdater/liblatitudeupdater.pro
+++ b/
liblatitudeupdater/liblatitudeupdater.pro
@@
-10,6
+10,3
@@
INCLUDEPATH += ../libkqoauth
HEADERS += googlelatitude.h gpscontrol.h
SOURCES += googlelatitude.cpp gpscontrol.cpp
HEADERS += googlelatitude.h gpscontrol.h
SOURCES += googlelatitude.cpp gpscontrol.cpp
-
-include(../deployment.pri)
-qtcAddDeployment()
diff --git
a/liblocationmaemo5/liblocationmaemo5.pro
b/liblocationmaemo5/liblocationmaemo5.pro
index
8492b81
..
606824b
100644
(file)
--- a/
liblocationmaemo5/liblocationmaemo5.pro
+++ b/
liblocationmaemo5/liblocationmaemo5.pro
@@
-20,5
+20,7
@@
SOURCES += gconfitem.cpp \
qgeosatelliteinfosource_maemo5.cpp
}
qgeosatelliteinfosource_maemo5.cpp
}
-include(../deployment.pri)
-qtcAddDeployment()
+contains(MEEGO_EDITION,harmattan) {
+ target.path = /opt/liblocationmaemo5/lib
+ INSTALLS += target
+}
diff --git
a/qtc_packaging/debian_harmattan/control
b/qtc_packaging/debian_harmattan/control
index
e347342
..
b5161b3
100644
(file)
--- a/
qtc_packaging/debian_harmattan/control
+++ b/
qtc_packaging/debian_harmattan/control
@@
-10,6
+10,7
@@
XSBC-Bugtracker: mailto:rodrigo@linfati.cl
Package: latitudeupdater
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Package: latitudeupdater
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Replaces: googlelatitude
Description: Google Latitude Updater
Features:
- Retrieve location using Cell Tower and/or Gps and send to Google Latitude
Description: Google Latitude Updater
Features:
- Retrieve location using Cell Tower and/or Gps and send to Google Latitude
diff --git
a/qtc_packaging/debian_harmattan/googlelatitude.aegis
b/qtc_packaging/debian_harmattan/googlelatitude.aegis
deleted file mode 100644
(file)
index
39bc771
..0000000
--- a/
qtc_packaging/debian_harmattan/googlelatitude.aegis
+++ /dev/null
@@
-1,10
+0,0 @@
-<aegis>
- <request policy="add">
- <credential name="Location" />
- <for path="/opt/linfati.com/bin/LatitudeUpdaterDaemon" />
- </request>
- <request policy="add">
- <credential name="Location" />
- <for path="/opt/linfati.com/bin/LatitudeUpdaterQML" />
- </request>
-</aegis>
diff --git a/qtc_packaging/debian_harmattan/latitudeupdater.aegis
b/qtc_packaging/debian_harmattan/latitudeupdater.aegis
new file mode 100644
(file)
index 0000000..
8348682
--- /dev/null
+++ b/
qtc_packaging/debian_harmattan/latitudeupdater.aegis
@@ -0,0
+1,8
@@
+<aegis>
+ <request policy="add">
+ <credential name="Location" />
+ <for path="/opt/linfati.com/bin/latitude.qml" />
+ <for path="/opt/linfati.com/bin/latitude.qt" />
+ <for path="/opt/linfati.com/bin/latituded" />
+ </request>
+</aegis>