You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by db...@apache.org on 2016/01/28 12:40:42 UTC
[1/5] cordova-ubuntu git commit: Fix debugging enabled flag & remove
webkit specific bit
Repository: cordova-ubuntu
Updated Branches:
refs/heads/4.3.x bfebe8ef0 -> f04e84882
Fix debugging enabled flag & remove webkit specific bit
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/906c64ed
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/906c64ed
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/906c64ed
Branch: refs/heads/4.3.x
Commit: 906c64edebd370c2fc33620c4cdd4f24c11e7e6a
Parents: bfebe8e
Author: Alexandre Abreu <al...@canonical.com>
Authored: Tue Jan 26 16:17:25 2016 -0500
Committer: David Barth <da...@canonical.com>
Committed: Thu Jan 28 12:38:21 2016 +0100
----------------------------------------------------------------------
CordovaUbuntu/CordovaViewInternal.qml | 4 ++--
bin/templates/project/cordova/lib/run.js | 8 ++++----
main.cpp | 24 ++++++++++++++++++++----
3 files changed, 26 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/906c64ed/CordovaUbuntu/CordovaViewInternal.qml
----------------------------------------------------------------------
diff --git a/CordovaUbuntu/CordovaViewInternal.qml b/CordovaUbuntu/CordovaViewInternal.qml
index 62d354b..42f7389 100644
--- a/CordovaUbuntu/CordovaViewInternal.qml
+++ b/CordovaUbuntu/CordovaViewInternal.qml
@@ -85,8 +85,8 @@ OrientationHelper {
context: WebContext {
id: webcontext
- devtoolsEnabled: true
- devtoolsPort: 9222
+ devtoolsEnabled: debuggingEnabled
+ devtoolsPort: debuggingEnabled ? 9222 : -1
userScripts: [
UserScript {
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/906c64ed/bin/templates/project/cordova/lib/run.js
----------------------------------------------------------------------
diff --git a/bin/templates/project/cordova/lib/run.js b/bin/templates/project/cordova/lib/run.js
index b96f49c..9f905d8 100644
--- a/bin/templates/project/cordova/lib/run.js
+++ b/bin/templates/project/cordova/lib/run.js
@@ -2,7 +2,7 @@
/*
*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2016 Canonical Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -88,10 +88,10 @@ function runNative(rootDir, debug) {
Utils.pushd(path.join(nativeDir, 'prefix'));
- var cmd = 'QTWEBKIT_INSPECTOR_SERVER=9222 ./cordova-ubuntu www/';
+ var cmd = './cordova-ubuntu www/';
if (debug) {
cmd = "DEBUG=1 " + cmd;
- logger.warn('Debug enabled. Try pointing a WebKit browser to http://127.0.0.1:9222');
+ logger.warn('Debug enabled. Try pointing a Chrome/Chromium browser to http://127.0.0.1:9222');
}
logger.info('Launching the application.');
@@ -134,7 +134,7 @@ function runOnDevice(rootDir, debug, target, architecture, framework) {
Devices.adbExec(target, 'shell "cd /home/phablet/; pkcon install-local ' + names[0] + ' -p --allow-untrusted -y"', {silent: false});
if (debug) {
- logger.warn('Debug enabled. Try pointing a WebKit browser to http://127.0.0.1:9222');
+ logger.warn('Debug enabled. Try pointing a Chrome/Chromium browser to http://127.0.0.1:9222');
Devices.adbExec(target, 'forward tcp:9222 tcp:9222');
}
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/906c64ed/main.cpp
----------------------------------------------------------------------
diff --git a/main.cpp b/main.cpp
index b12aa84..ffef445 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
* Copyright 2011 Wolfgang Koller - http://www.gofg.at/
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,11 @@
#include <QApplication>
#include <QtQuick>
-static void customMessageOutput(QtMsgType type, const QMessageLogContext &, const QString &msg) {
+static void customMessageOutput(
+ QtMsgType type,
+ const QMessageLogContext &,
+ const QString &msg) {
+
switch (type) {
case QtDebugMsg:
if (qgetenv("DEBUG").size()) {
@@ -39,10 +43,13 @@ static void customMessageOutput(QtMsgType type, const QMessageLogContext &, cons
}
int main(int argc, char *argv[]) {
- printf("\nApache Cordova native platform version %s is starting\n\n", CORDOVA_UBUNTU_VERSION);
+ printf("\nApache Cordova native platform version %s is starting\n\n"
+ , CORDOVA_UBUNTU_VERSION);
+
fflush(stdout);
qInstallMessageHandler(customMessageOutput);
+
QApplication app(argc, argv);
//TODO: switch to options parser
@@ -60,7 +67,16 @@ int main(int argc, char *argv[]) {
QQmlApplicationEngine view;
QDir workingDir = QApplication::applicationDirPath();
- view.rootContext()->setContextProperty("www", wwwDir.absolutePath());
+
+ bool debuggingEnabled =
+ (qEnvironmentVariableIsSet("DEBUG")
+ && QString(qgetenv("DEBUG")) == "1");
+
+ view.rootContext()->setContextProperty(
+ "debuggingEnabled", debuggingEnabled);
+
+ view.rootContext()->setContextProperty(
+ "www", wwwDir.absolutePath());
view.load(QUrl(QString("%1/qml/main.qml").arg(workingDir.absolutePath())));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[3/5] cordova-ubuntu git commit: fix typo
Posted by db...@apache.org.
fix typo
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/df9c2700
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/df9c2700
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/df9c2700
Branch: refs/heads/4.3.x
Commit: df9c270009ca6ac361e26918a9f75022db2cd8fd
Parents: 47dd580
Author: Peter Bakondy <pb...@gmail.com>
Authored: Wed Jan 20 11:07:54 2016 +0100
Committer: David Barth <da...@canonical.com>
Committed: Thu Jan 28 12:38:41 2016 +0100
----------------------------------------------------------------------
RELEASENOTES.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/df9c2700/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index ce7d54c..dd646c4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -29,7 +29,7 @@
### 4.3.1 ###
* default icon name `www/img/logo.png`
-* add defaut icon parameter to `config.xml`
+* add default icon parameter to `config.xml`
* use `QUrl::fromLocalFile()`
* set `mainUrl` when the file exists
* fix critical issue introduced by general URL support changes earlier
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[2/5] cordova-ubuntu git commit: Fix reliance on deprecated Oxide's
onLoadingChanged signal
Posted by db...@apache.org.
Fix reliance on deprecated Oxide's onLoadingChanged signal
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/47dd580b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/47dd580b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/47dd580b
Branch: refs/heads/4.3.x
Commit: 47dd580bba932bb4a265ed19b928d518117eaac0
Parents: 906c64e
Author: Alexandre Abreu <al...@canonical.com>
Authored: Tue Jan 26 11:25:39 2016 -0500
Committer: David Barth <da...@canonical.com>
Committed: Thu Jan 28 12:38:32 2016 +0100
----------------------------------------------------------------------
CordovaUbuntu/CordovaViewInternal.qml | 10 +++++-----
src/coreplugins.cpp | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/47dd580b/CordovaUbuntu/CordovaViewInternal.qml
----------------------------------------------------------------------
diff --git a/CordovaUbuntu/CordovaViewInternal.qml b/CordovaUbuntu/CordovaViewInternal.qml
index 42f7389..87f5fac 100644
--- a/CordovaUbuntu/CordovaViewInternal.qml
+++ b/CordovaUbuntu/CordovaViewInternal.qml
@@ -1,6 +1,6 @@
/*
*
- * Copyright 2013 Canonical Ltd.
+ * Copyright 2013-2016 Canonical Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,10 +17,10 @@
*
*/
import QtQuick 2.0
-import com.canonical.Oxide 1.0
+import com.canonical.Oxide 1.10
import "cordova_wrapper.js" as CordovaWrapper
-import Ubuntu.Components 0.1
-import Ubuntu.Components.Popups 0.1
+import Ubuntu.Components 1.0
+import Ubuntu.Components.Popups 1.0
OrientationHelper {
id: root
@@ -129,7 +129,7 @@ OrientationHelper {
cordova.setTitle(webView.title)
}
- onLoadingChanged: {
+ onLoadingStateChanged: {
if (!webView.loading) {
root.completed()
cordova.loadFinished(true)
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/47dd580b/src/coreplugins.cpp
----------------------------------------------------------------------
diff --git a/src/coreplugins.cpp b/src/coreplugins.cpp
index fc1a115..646eafe 100644
--- a/src/coreplugins.cpp
+++ b/src/coreplugins.cpp
@@ -26,7 +26,7 @@ INSERT_HEADER_HERE
extern "C" {
-Q_DECL_EXPORT QList<QSharedPointer<CPlugin>> cordovaGetPluginInstances(Cordova *cordova) {
+Q_DECL_EXPORT QList<QSharedPointer<CPlugin>> cordovaGetPluginInstances(Cordova *) {
QList<QSharedPointer<CPlugin>> res;
INSERT_PLUGIN_HERE
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[5/5] cordova-ubuntu git commit: CB-10453 Updated RELEASENOTES and
Version for release 4.3.3
Posted by db...@apache.org.
CB-10453 Updated RELEASENOTES and Version for release 4.3.3
Conflicts:
package.json
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/f04e8488
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/f04e8488
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/f04e8488
Branch: refs/heads/4.3.x
Commit: f04e84882cbf03d524353cb43eba7e57df99c39b
Parents: 6efde68
Author: David Barth <da...@canonical.com>
Authored: Thu Jan 28 12:27:12 2016 +0100
Committer: David Barth <da...@canonical.com>
Committed: Thu Jan 28 12:39:48 2016 +0100
----------------------------------------------------------------------
RELEASENOTES.md | 6 ++++++
package.json | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/f04e8488/RELEASENOTES.md
----------------------------------------------------------------------
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index dd646c4..af16f55 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -20,6 +20,12 @@
-->
## Release Notes for Cordova Ubuntu ##
+### 4.3.3
+* Fix reliance on deprecated Oxide's onLoadingChanged signal
+* Fix debugging enabled flag & remove webkit specific bit
+* fix typo
+* adding missing node_modules
+
### 4.3.2 ###
* CB-10119 - change click framework to 15.04 by default (14.10 is deprecated)
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/f04e8488/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 1a52ca4..9480a67 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cordova-ubuntu",
- "version": "4.3.2",
+ "version": "4.3.3",
"description": "Cordova tooling for the Ubuntu platform.",
"main": "bin/create",
"repository": {
@@ -46,4 +46,4 @@
}
],
"license": "Apache Version 2.0"
-}
\ No newline at end of file
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[4/5] cordova-ubuntu git commit: Use com.canonical.oxide 1.9 only,
1.10 won't work
Posted by db...@apache.org.
Use com.canonical.oxide 1.9 only, 1.10 won't work
Project: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/commit/6efde68e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/tree/6efde68e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/diff/6efde68e
Branch: refs/heads/4.3.x
Commit: 6efde68e3478897e8ae2b9889ee9aefa259156bd
Parents: df9c270
Author: David Barth <da...@canonical.com>
Authored: Thu Jan 28 12:15:01 2016 +0100
Committer: David Barth <da...@canonical.com>
Committed: Thu Jan 28 12:38:57 2016 +0100
----------------------------------------------------------------------
CordovaUbuntu/CordovaViewInternal.qml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-ubuntu/blob/6efde68e/CordovaUbuntu/CordovaViewInternal.qml
----------------------------------------------------------------------
diff --git a/CordovaUbuntu/CordovaViewInternal.qml b/CordovaUbuntu/CordovaViewInternal.qml
index 87f5fac..02dea8c 100644
--- a/CordovaUbuntu/CordovaViewInternal.qml
+++ b/CordovaUbuntu/CordovaViewInternal.qml
@@ -17,7 +17,7 @@
*
*/
import QtQuick 2.0
-import com.canonical.Oxide 1.10
+import com.canonical.Oxide 1.9
import "cordova_wrapper.js" as CordovaWrapper
import Ubuntu.Components 1.0
import Ubuntu.Components.Popups 1.0
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org