Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	.qmake.conf
	sync.profile

Change-Id: I9d0d430d894c4ba1409e19ff9244cf94937eb021

8 files changed, 53 insertions, 20 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" }
diff --git a/sync.profile b/sync.profile
index 294aa256..92f02601 100644
--- a/sync.profile
+++ b/sync.profile
@@ -6,14 +6,15 @@
 # Each of the module version specifiers can take one of the following values:
 #   - A specific Git revision.
 #   - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
+#   - an empty string to use the same branch under test (dependencies will become "refs/heads/master" if we are in the master branch)
 #
 %dependencies = (
-    "qtbase" => "refs/heads/dev",
-    "qtscript" => "refs/heads/dev",
-    "qtxmlpatterns" => "refs/heads/dev",
-    "qtdeclarative" => "refs/heads/dev",
-    "qtjsbackend" => "refs/heads/dev",
-    "qtactiveqt" => "refs/heads/dev",
-    "qttools" => "refs/heads/dev",
-    "qtwebkit" => "refs/heads/dev",
+    "qtbase" => "",
+    "qtscript" => "",
+    "qtxmlpatterns" => "",
+    "qtdeclarative" => "",
+    "qtjsbackend" => "",
+    "qtactiveqt" => "",
+    "qttools" => "",
+    "qtwebkit" => "",
 );
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index 80b1e19a..f9106876 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -1,6 +1,4 @@
-TEMPLATE = app
 CONFIG += uic declarative_debug declarative
-DESTDIR = $$QT.declarative.bins
 
 include(qml.pri)
 
@@ -8,9 +6,6 @@ SOURCES += main.cpp
 
 DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
 
-target.path = $$[QT_INSTALL_BINS]
-INSTALLS += target
-
 wince* {
     QT += xml
 
@@ -35,3 +30,5 @@ mac {
 } else {
     TARGET=qmlviewer
 }
+
+load(qt_app)
diff --git a/tools/qmlplugindump/qmlplugindump.pro b/tools/qmlplugindump/qmlplugindump.pro
index ba71223b..cf812859 100644
--- a/tools/qmlplugindump/qmlplugindump.pro
+++ b/tools/qmlplugindump/qmlplugindump.pro
@@ -11,7 +11,12 @@ SOURCES += \
 HEADERS += \
     qmlstreamwriter.h
 
-OTHER_FILES += Info.plist
-macx: QMAKE_INFO_PLIST = Info.plist
+mac {
+    # Prevent qmlplugindump from popping up in the dock when launched.
+    # We embed the Info.plist file, so the application doesn't need to
+    # be a bundle.
+    QMAKE_LFLAGS += -sectcreate __TEXT __info_plist $$shell_quote($$PWD/Info.plist)
+    CONFIG -= app_bundle
+}
 
 load(qt_tool)
diff --git a/tools/tools.pro b/tools/tools.pro
index 5d3fa37b..f37bead6 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,2 +1,7 @@
 TEMPLATE = subdirs
-!ios: SUBDIRS += qml qmlplugindump
+SUBDIRS += qml qmlplugindump
+
+qtNomakeTools( \
+    qml \
+    qmlplugindump \
+)