bluerock/app
bluerock/app
2
0
Fork 0
Code Issues 8 Pull requests Projects Releases 9 Packages 1 Wiki Activity

Merge v0.6.0 and v0.6.1 #29

Merged
dorian merged 30 commits from version/0.5.1 into master 2024-10-17 17:52:37 +02:00
Conversation 1 Commits 30 Files changed 136 +3 -1
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7d6b972ef3 - Show all commits

2
headers/bluerockbackend.h
View file

@ -52,7 +52,9 @@ private:
QVariantMap _senddata(QUrl serviceUrl, QUrlQuery pdata = QUrlQuery()); QVariantMap _senddata(QUrl serviceUrl, QUrlQuery pdata = QUrlQuery());
ShareUtils* _shareUtils; ShareUtils* _shareUtils;
#ifdef Q_OS_IOS
IosPermissionUtils* _iosPermissionUtils; IosPermissionUtils* _iosPermissionUtils;
#endif
const QStringList _validBaseDomains = {"digitalrock.de", "bluerock.dev"}; const QStringList _validBaseDomains = {"digitalrock.de", "bluerock.dev"};
bool _pendingIntentsChecked; bool _pendingIntentsChecked;
signals: signals:

2
resources/qml/main.qml
View file

@ -198,7 +198,7 @@ Window {
//openWidget({comp: 11651, cat: 26}) //openWidget({comp: 11651, cat: 26})
//openWidget({person: 6623}) //openWidget({person: 6623})
//console.log(JSON.stringify(serverConn.getParamsFromUrl(""))) //console.log(JSON.stringify(serverConn.getParamsFromUrl("")))
openWidgetFromUrl("https://l.bluerock.dev/?comp=11601&type=starters") //openWidgetFromUrl("https://l.bluerock.dev/?comp=11601&type=starters")
} }
FontLoader { FontLoader {