summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-04 19:50:51 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-06-04 19:50:51 +0200
commita469bc673b20751eaaedd29c3efb9462ae148538 (patch)
tree8313f3e2c6806aad2b0c84bf04f12a4b2908bd9c /src
parent7f1bcb38ef61b2af9ff50c1ae474ed38fa901755 (diff)
parent4a1505d5177d42ad2369d207be402a7846fd564a (diff)
downloadqtquick1-a469bc673b20751eaaedd29c3efb9462ae148538.tar.gz
Merge remote-tracking branch 'origin/stable' into dev
Conflicts: .qmake.conf sync.profile Change-Id: I9d0d430d894c4ba1409e19ff9244cf94937eb021
Diffstat (limited to 'src')
-rw-r--r--src/declarative/qml/parser/qdeclarativejs.g1
-rw-r--r--src/declarative/qml/qdeclarativeprivate.h3
-rw-r--r--src/imports/builtins.qmltypes21
-rw-r--r--src/imports/folderlistmodel/plugins.qmltypes8
4 files changed, 29 insertions, 4 deletions
diff --git a/src/declarative/qml/parser/qdeclarativejs.g b/src/declarative/qml/parser/qdeclarativejs.g
index 19364c3f..dc466aec 100644
--- a/src/declarative/qml/parser/qdeclarativejs.g
+++ b/src/declarative/qml/parser/qdeclarativejs.g
@@ -1,7 +1,6 @@
----------------------------------------------------------------------------
--
-- Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
--- All rights reserved.
-- Contact: http://www.qt-project.org/legal
--
-- This file is part of the QtDeclarative module of the Qt Toolkit.
diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h
index 05a457c3..6f95dde7 100644
--- a/src/declarative/qml/qdeclarativeprivate.h
+++ b/src/declarative/qml/qdeclarativeprivate.h
@@ -55,6 +55,7 @@
#include <QtDeclarative/qtdeclarativeglobal.h>
#include <QtCore/qvariant.h>
+#include <QtCore/qurl.h>
QT_BEGIN_NAMESPACE
@@ -232,7 +233,7 @@ namespace QDeclarativePrivate
};
struct RegisterComponent {
- const QUrl &url;
+ QUrl url;
const char *uri;
const char *typeName;
int majorVersion;
diff --git a/src/imports/builtins.qmltypes b/src/imports/builtins.qmltypes
index 0e888ff0..e0afc68b 100644
--- a/src/imports/builtins.qmltypes
+++ b/src/imports/builtins.qmltypes
@@ -2720,9 +2720,11 @@ Module {
"SplashScreen": 15,
"Desktop": 17,
"SubWindow": 18,
+ "ForeignWindow": 33,
"WindowType_Mask": 255,
"MSWindowsFixedSizeDialogHint": 256,
"MSWindowsOwnDC": 512,
+ "BypassWindowManagerHint": 1024,
"X11BypassWindowManagerHint": 1024,
"FramelessWindowHint": 2048,
"WindowTitleHint": 4096,
@@ -2761,9 +2763,11 @@ Module {
"SplashScreen": 15,
"Desktop": 17,
"SubWindow": 18,
+ "ForeignWindow": 33,
"WindowType_Mask": 255,
"MSWindowsFixedSizeDialogHint": 256,
"MSWindowsOwnDC": 512,
+ "BypassWindowManagerHint": 1024,
"X11BypassWindowManagerHint": 1024,
"FramelessWindowHint": 2048,
"WindowTitleHint": 4096,
@@ -2959,7 +2963,8 @@ Module {
"AA_X11InitThreads": 10,
"AA_SynthesizeTouchForUnhandledMouseEvents": 11,
"AA_SynthesizeMouseForUnhandledTouchEvents": 12,
- "AA_AttributeCount": 13
+ "AA_UseHighDpiPixmaps": 13,
+ "AA_AttributeCount": 14
}
}
Enum {
@@ -3644,6 +3649,15 @@ Module {
}
}
Enum {
+ name: "Edge"
+ values: {
+ "TopEdge": 1,
+ "LeftEdge": 2,
+ "RightEdge": 4,
+ "BottomEdge": 8
+ }
+ }
+ Enum {
name: "ConnectionType"
values: {
"AutoConnection": 0,
@@ -3770,6 +3784,7 @@ Module {
"ImhDate": 128,
"ImhTime": 256,
"ImhPreferLatin": 512,
+ "ImhMultiLine": 1024,
"ImhDigitsOnly": 65536,
"ImhFormattedNumbersOnly": 131072,
"ImhUppercaseOnly": 262144,
@@ -3795,6 +3810,7 @@ Module {
"ImhDate": 128,
"ImhTime": 256,
"ImhPreferLatin": 512,
+ "ImhMultiLine": 1024,
"ImhDigitsOnly": 65536,
"ImhFormattedNumbersOnly": 131072,
"ImhUppercaseOnly": 262144,
@@ -3864,7 +3880,8 @@ Module {
"ItemIsDropEnabled": 8,
"ItemIsUserCheckable": 16,
"ItemIsEnabled": 32,
- "ItemIsTristate": 64
+ "ItemIsTristate": 64,
+ "ItemNeverHasChildren": 128
}
}
Enum {
diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes
index cfe64f0c..5745a829 100644
--- a/src/imports/folderlistmodel/plugins.qmltypes
+++ b/src/imports/folderlistmodel/plugins.qmltypes
@@ -9,6 +9,14 @@ Module {
Component {
name: "QAbstractItemModel"
prototype: "QObject"
+ Enum {
+ name: "LayoutChangeHint"
+ values: {
+ "NoLayoutChangeHint": 0,
+ "VerticalSortHint": 1,
+ "HorizontalSortHint": 2
+ }
+ }
Signal {
name: "dataChanged"
Parameter { name: "topLeft"; type: "QModelIndex" }