summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/uikit/examples
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/platforms/uikit/examples')
-rw-r--r--src/plugins/platforms/uikit/examples/qmltest/main.mm10
-rw-r--r--src/plugins/platforms/uikit/examples/qmltest/qml/main.qml4
-rw-r--r--src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp2
3 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/platforms/uikit/examples/qmltest/main.mm b/src/plugins/platforms/uikit/examples/qmltest/main.mm
index 785cf362..a628e908 100644
--- a/src/plugins/platforms/uikit/examples/qmltest/main.mm
+++ b/src/plugins/platforms/uikit/examples/qmltest/main.mm
@@ -51,14 +51,14 @@ Q_IMPORT_PLUGIN(UIKit)
static QString qStringFromNSString(NSString *nsstring)
{
- return QString::fromUtf8([nsstring UTF8String]);
+ return QString::fromUtf8([nsstring UTF8String]);
}
static QString documentsDirectory()
{
- NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
- NSString *documentsDirectory = [paths objectAtIndex:0];
- return qStringFromNSString(documentsDirectory);
+ NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+ NSString *documentsDirectory = [paths objectAtIndex:0];
+ return qStringFromNSString(documentsDirectory);
}
int main(int argc, char *argv[]) {
@@ -68,7 +68,7 @@ int main(int argc, char *argv[]) {
QApplication app(argc, argv);
QmlApplicationViewer viewer;
viewer.setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
- viewer.engine()->setOfflineStoragePath(documentsDirectory());
+ viewer.engine()->setOfflineStoragePath(documentsDirectory());
NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
viewer.setMainQmlFile(qStringFromNSString([resourcePath stringByAppendingPathComponent:@"qml/main.qml"]));
viewer.showMaximized();
diff --git a/src/plugins/platforms/uikit/examples/qmltest/qml/main.qml b/src/plugins/platforms/uikit/examples/qmltest/qml/main.qml
index f2a7b59e..5d5fe4ec 100644
--- a/src/plugins/platforms/uikit/examples/qmltest/qml/main.qml
+++ b/src/plugins/platforms/uikit/examples/qmltest/qml/main.qml
@@ -53,7 +53,7 @@ Rectangle {
Text { text: "Click"; font.pixelSize: 16; anchors.centerIn: parent }
MouseArea {
- anchors.fill: parent
+ anchors.fill: parent
hoverEnabled: true
acceptedButtons: Qt.LeftButton | Qt.RightButton
@@ -61,7 +61,7 @@ Rectangle {
onExited: info.text = 'Exited (pressed=' + pressed + ')'
onPressed: {
- info.text = 'Pressed (button=' + (mouse.button == Qt.RightButton ? 'right' : 'left')
+ info.text = 'Pressed (button=' + (mouse.button == Qt.RightButton ? 'right' : 'left')
+ ' shift=' + (mouse.modifiers & Qt.ShiftModifier ? 'true' : 'false') + ')'
var posInBox = redSquare.mapToItem(box, mouse.x, mouse.y)
posInfo.text = + mouse.x + ',' + mouse.y + ' in square'
diff --git a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp
index c4fa3868..f44813d2 100644
--- a/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp
+++ b/src/plugins/platforms/uikit/examples/share/qmlapplicationviewer/moc_qmlapplicationviewer.cpp
@@ -87,7 +87,7 @@ void QmlApplicationViewer::qt_static_metacall(QObject *_o, QMetaObject::Call _c,
}
const QMetaObjectExtraData QmlApplicationViewer::staticMetaObjectExtraData = {
- 0, qt_static_metacall
+ 0, qt_static_metacall
};
const QMetaObject QmlApplicationViewer::staticMetaObject = {