Skip to content

Commit 63349bc

Browse files
author
Michael Tims
authored
Merge pull request #304 from Esri/v.next
V.next
2 parents 9874764 + 30d05f3 commit 63349bc

29 files changed

+83
-33
lines changed

Examples/CalloutExample.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ import QtQuick 2.3
1818
import QtQuick.Controls 1.2
1919
import QtPositioning 5.3
2020
import QtSensors 5.3
21-
import Esri.ArcGISRuntime 100.3
21+
import Esri.ArcGISRuntime 100.4
2222
import Esri.ArcGISExtras 1.1
23-
import Esri.ArcGISRuntime.Toolkit.Controls 100.3
23+
import Esri.ArcGISRuntime.Toolkit.Controls 100.4
2424

2525
Rectangle {
2626
width: 800

Examples/Examples.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import QtQuick 2.0
1818
import QtQuick.Controls 1.1
1919
import QtGraphicalEffects 1.0
20-
import Esri.ArcGISRuntime 100.3
20+
import Esri.ArcGISRuntime 100.4
2121

2222
Rectangle {
2323
width: 640

Examples/PopupExample.qml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ import QtQuick.Controls 1.5
1919
import QtPositioning 5.3
2020
import QtSensors 5.3
2121
import QtQuick.Dialogs 1.2
22-
import Esri.ArcGISRuntime 100.3
22+
import Esri.ArcGISRuntime 100.4
2323
import Esri.ArcGISExtras 1.1
24-
import Esri.ArcGISRuntime.Toolkit.Controls 100.3
24+
import Esri.ArcGISRuntime.Toolkit.Controls 100.4
2525

2626
Rectangle {
2727
id: root

Import/Esri/ArcGISRuntime/Toolkit/Controls/Callout.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ Item {
215215
/*! \internal */
216216
property int padding: 3 * displayScaleFactor
217217
/*! \internal */
218-
property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
218+
property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
219219
/*! \internal */
220220
property real anchorPointx: 0
221221
/*! \internal */

Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/ArcGISCompass.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Item {
4949
}
5050
\endcode
5151
*/
52-
property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
52+
property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
5353

5454
/*!
5555
\qmlproperty bool autoHideCompass

Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/CoordinateConversion.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Item {
5151
}
5252
\endcode
5353
*/
54-
property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
54+
property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
5555

5656
/*!
5757
\qmlproperty int textColor
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
/*******************************************************************************
2+
* Copyright 2012-2018 Esri
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
******************************************************************************/
16+
17+
/*!
18+
\internal
19+
This QML file is only used for incrementing the current version of the toolkit and
20+
should not be used in your application.
21+
*/
22+
import QtQuick 2.2
23+
24+
Component {}

Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/TimeSlider.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ Item {
8787
the width or height of UI elements so that the sizes appear similar
8888
(relative to screen size) across devices.
8989
*/
90-
property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
90+
property real scaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
9191

9292
/*!
9393
\qmlproperty int textColor

Import/Esri/ArcGISRuntime/Toolkit/Controls/CppApi/qmldir

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ module Esri.ArcGISRuntime.Toolkit.Controls.CppApi
1919
CoordinateConversion 100.2 CoordinateConversion.qml
2020
ArcGISCompass 100.2 ArcGISCompass.qml
2121
TimeSlider 100.3 TimeSlider.qml
22+
CurrentVersion 100.4 CurrentVersion.qml

Import/Esri/ArcGISRuntime/Toolkit/Controls/LocationButton20.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ StyleButton {
2525
id: locationButton
2626
property bool isActive: mapview && mapview.locationDisplay.started
2727
property int maxModes: 4;
28-
property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" ? 96 : 72)
28+
property real displayScaleFactor: (Screen.logicalPixelDensity * 25.4) / (Qt.platform.os === "windows" || Qt.platform.os === "linux" ? 96 : 72)
2929
property MapView mapview: null
3030

3131
visible: mapview && mapview.locationDisplay

0 commit comments

Comments
 (0)