Merge remote-tracking branch 'origin/dev' into wip/cmake

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

1 files changed, 11 insertions, 0 deletions

diff --git a/src/imports/builtins/builtins.qmltypes b/src/imports/builtins/builtins.qmltypes
index c783c63caf..765c92fcb9 100644
--- a/src/imports/builtins/builtins.qmltypes
+++ b/src/imports/builtins/builtins.qmltypes
@@ -1685,6 +1685,17 @@ Module {
                 "ChecksumItuV41": 1
             }
         }
+        Enum {
+            name: "HighDpiScaleFactorRoundingPolicy"
+            values: {
+                "Unset": 0,
+                "Round": 1,
+                "Ceil": 2,
+                "Floor": 3,
+                "RoundPreferFloor": 4,
+                "PassThrough": 5
+            }
+        }
     }
     Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" }
 }