summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-08-03 12:14:25 +0200
committerEskil Abrahamsen-Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-08-05 11:32:31 +0300
commitb90b7a8823b4190d62f61a951cb24925f86e0f0d (patch)
treebfc96b478dff64aec0fe49e3c1be094580130632
parentd0f284e7d1ddf5f7b2a68d2cb2a1285030797021 (diff)
com.digia.* -> org.qtproject.*
In preparation of submitting to the Qt Project, change all domains from com.digia to org.qtproject. Change-Id: Id5e9676fdb6de6244447288d35c5c4cb41bbd577 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
-rw-r--r--examples/purchasing/qthangman/main.cpp2
-rw-r--r--examples/purchasing/qthangman/qml/qthangman/MainView.qml2
-rw-r--r--examples/purchasing/qthangman/qml/qthangman/StoreView.qml4
-rw-r--r--examples/purchasing/qthangman/qthangman.pro4
-rw-r--r--src/android/jar.pri2
-rw-r--r--src/android/src/org/qtproject/qt5/android/purchasing/Base64.java (renamed from src/android/src/com/digia/qt5/android/purchasing/Base64.java)2
-rw-r--r--src/android/src/org/qtproject/qt5/android/purchasing/Base64DecoderException.java (renamed from src/android/src/com/digia/qt5/android/purchasing/Base64DecoderException.java)2
-rw-r--r--src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java (renamed from src/android/src/com/digia/qt5/android/purchasing/QtInAppPurchase.java)2
-rw-r--r--src/android/src/org/qtproject/qt5/android/purchasing/Security.java (renamed from src/android/src/com/digia/qt5/android/purchasing/Security.java)2
-rw-r--r--src/purchasing/doc/qtpurchasing.qdocconf2
-rw-r--r--src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp2
-rw-r--r--src/purchasing/inapppurchase/android/qandroidjni.cpp2
12 files changed, 14 insertions, 14 deletions
diff --git a/examples/purchasing/qthangman/main.cpp b/examples/purchasing/qthangman/main.cpp
index ae7d80d..fca614c 100644
--- a/examples/purchasing/qthangman/main.cpp
+++ b/examples/purchasing/qthangman/main.cpp
@@ -28,7 +28,7 @@ int main(int argc, char *argv[])
{
QGuiApplication app(argc, argv);
- qmlRegisterType<HangmanGame>("com.digia.qthangman", 1, 0, "HangmanGame");
+ qmlRegisterType<HangmanGame>("org.qtproject.qthangman", 1, 0, "HangmanGame");
QQmlApplicationEngine engine(QUrl("qrc:/qml/qthangman/main.qml"));
diff --git a/examples/purchasing/qthangman/qml/qthangman/MainView.qml b/examples/purchasing/qthangman/qml/qthangman/MainView.qml
index 990f51a..5f3071c 100644
--- a/examples/purchasing/qthangman/qml/qthangman/MainView.qml
+++ b/examples/purchasing/qthangman/qml/qthangman/MainView.qml
@@ -20,7 +20,7 @@
import QtQuick 2.2
import QtQuick.Controls 1.1
-import com.digia.qthangman 1.0
+import org.qtproject.qthangman 1.0
import QtPurchasing 1.0
Item {
diff --git a/examples/purchasing/qthangman/qml/qthangman/StoreView.qml b/examples/purchasing/qthangman/qml/qthangman/StoreView.qml
index 25bce6a..6fa17a1 100644
--- a/examples/purchasing/qthangman/qml/qthangman/StoreView.qml
+++ b/examples/purchasing/qthangman/qml/qthangman/StoreView.qml
@@ -67,7 +67,7 @@ Item {
id: product100Vowels
store: iapStore
type: Product.Consumable
- identifier: "com.digia.qthangman.100vowels"
+ identifier: "org.qtproject.qthangman.100vowels"
onPurchaseSucceeded: {
console.log(identifier + " purchase successful");
@@ -89,7 +89,7 @@ Item {
id: productUnlockVowels
type: Product.Unlockable
store: iapStore
- identifier: "com.digia.qthangman.unlockvowels"
+ identifier: "org.qtproject.qthangman.unlockvowels"
onPurchaseSucceeded: {
console.log(identifier + " purchase successful");
diff --git a/examples/purchasing/qthangman/qthangman.pro b/examples/purchasing/qthangman/qthangman.pro
index 978ad33..d1bea15 100644
--- a/examples/purchasing/qthangman/qthangman.pro
+++ b/examples/purchasing/qthangman/qthangman.pro
@@ -34,7 +34,7 @@ OTHER_FILES += \
ios {
#Change the following lines to match your unique App ID
#to enable in-app purchases on iOS
- #For example if your App ID is com.digia.qt.iosteam.qthangman"
- #QMAKE_TARGET_BUNDLE_PREFIX = "com.digia.qt.iosteam"
+ #For example if your App ID is org.qtproject.qt.iosteam.qthangman"
+ #QMAKE_TARGET_BUNDLE_PREFIX = "org.qtproject.qt.iosteam"
#TARGET = qthangman
}
diff --git a/src/android/jar.pri b/src/android/jar.pri
index 19031ca..9edcef9 100644
--- a/src/android/jar.pri
+++ b/src/android/jar.pri
@@ -1,7 +1,7 @@
CONFIG += java
DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar
-PATHPREFIX = $$PWD/src/com/digia/qt5/android/purchasing/
+PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/purchasing/
!build_pass {
isEmpty(SDK_ROOT): SDK_ROOT = $$(ANDROID_SDK_ROOT)
diff --git a/src/android/src/com/digia/qt5/android/purchasing/Base64.java b/src/android/src/org/qtproject/qt5/android/purchasing/Base64.java
index e2374fe..0d1d190 100644
--- a/src/android/src/com/digia/qt5/android/purchasing/Base64.java
+++ b/src/android/src/org/qtproject/qt5/android/purchasing/Base64.java
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.digia.qt5.android.purchasing;
+package org.qtproject.qt5.android.purchasing;
// This code was converted from code at http://iharder.sourceforge.net/base64/
// Lots of extraneous features were removed.
diff --git a/src/android/src/com/digia/qt5/android/purchasing/Base64DecoderException.java b/src/android/src/org/qtproject/qt5/android/purchasing/Base64DecoderException.java
index a1d10ae..107f8a2 100644
--- a/src/android/src/com/digia/qt5/android/purchasing/Base64DecoderException.java
+++ b/src/android/src/org/qtproject/qt5/android/purchasing/Base64DecoderException.java
@@ -13,7 +13,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package com.digia.qt5.android.purchasing;
+package org.qtproject.qt5.android.purchasing;
/**
* Exception thrown when encountering an invalid Base64 input character.
diff --git a/src/android/src/com/digia/qt5/android/purchasing/QtInAppPurchase.java b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
index 2be9bdb..7e743b1 100644
--- a/src/android/src/com/digia/qt5/android/purchasing/QtInAppPurchase.java
+++ b/src/android/src/org/qtproject/qt5/android/purchasing/QtInAppPurchase.java
@@ -18,7 +18,7 @@
**
****************************************************************************/
-package com.digia.qt5.android.purchasing;
+package org.qtproject.qt5.android.purchasing;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/src/android/src/com/digia/qt5/android/purchasing/Security.java b/src/android/src/org/qtproject/qt5/android/purchasing/Security.java
index 08def7a..0a7b29e 100644
--- a/src/android/src/com/digia/qt5/android/purchasing/Security.java
+++ b/src/android/src/org/qtproject/qt5/android/purchasing/Security.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.digia.qt5.android.purchasing;
+package org.qtproject.qt5.android.purchasing;
import android.text.TextUtils;
import android.util.Log;
diff --git a/src/purchasing/doc/qtpurchasing.qdocconf b/src/purchasing/doc/qtpurchasing.qdocconf
index d062974..98eec3b 100644
--- a/src/purchasing/doc/qtpurchasing.qdocconf
+++ b/src/purchasing/doc/qtpurchasing.qdocconf
@@ -12,7 +12,7 @@ version = 1.0.2
qhp.projects = QtPurchasing
qhp.QtPurchasing.file = qtpurchasing.qhp
-qhp.QtPurchasing.namespace = com.digia.qtpurchasing.1.0
+qhp.QtPurchasing.namespace = org.qtproject.qtpurchasing.1.0
qhp.QtPurchasing.virtualFolder = qtpurchasing
qhp.QtPurchasing.indexTitle = Qt Purchasing
qhp.QtPurchasing.indexRoot =
diff --git a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
index 487f0a6..1c3f641 100644
--- a/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
+++ b/src/purchasing/inapppurchase/android/qandroidinapppurchasebackend.cpp
@@ -44,7 +44,7 @@ QAndroidInAppPurchaseBackend::QAndroidInAppPurchaseBackend(QObject *parent)
qDebug("Creating backend");
#endif
- m_javaObject = QAndroidJniObject("com/digia/qt5/android/purchasing/QtInAppPurchase",
+ m_javaObject = QAndroidJniObject("org/qtproject/qt5/android/purchasing/QtInAppPurchase",
"(Landroid/content/Context;J)V",
QtAndroid::androidActivity().object<jobject>(),
reinterpret_cast<jlong>(this));
diff --git a/src/purchasing/inapppurchase/android/qandroidjni.cpp b/src/purchasing/inapppurchase/android/qandroidjni.cpp
index c174ec6..5a4b852 100644
--- a/src/purchasing/inapppurchase/android/qandroidjni.cpp
+++ b/src/purchasing/inapppurchase/android/qandroidjni.cpp
@@ -117,7 +117,7 @@ jint JNICALL JNI_OnLoad(JavaVM *vm, void *)
if (vm->GetEnv(reinterpret_cast<void **>(&env), JNI_VERSION_1_4) != JNI_OK)
return JNI_FALSE;
- jclass clazz = env->FindClass("com/digia/qt5/android/purchasing/QtInAppPurchase");
+ jclass clazz = env->FindClass("org/qtproject/qt5/android/purchasing/QtInAppPurchase");
if (env->RegisterNatives(clazz, methods, sizeof(methods) / sizeof(methods[0])) < 0)
return JNI_FALSE;