diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 16:35:04 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:25:39 +0200 |
commit | 421a6e5cc9a823b9f0a64a0c2891607a3ac46999 (patch) | |
tree | 3004703c5fe6a0306549e7c87c83265383c6634b | |
parent | b35d793648a24b229aac75ea43d5a175967304ca (diff) | |
parent | 5ed36a9fe84f78c66692bb4a0395cb09eaf31d66 (diff) |
Merge branch 'release' into old/5.0old/5.0
Change-Id: If07b91b27071346ff6ab831be4eb1173e8024f34
-rw-r--r-- | dist/changes-5.0.2 | 22 | ||||
-rw-r--r-- | qtquick1.pro | 2 | ||||
-rw-r--r-- | sync.profile | 16 |
3 files changed, 32 insertions, 8 deletions
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 new file mode 100644 index 00000000..708a3826 --- /dev/null +++ b/dist/changes-5.0.2 @@ -0,0 +1,22 @@ +Qt 5.0.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.0.0 and 5.0.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.0/ + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + +**************************************************************************** +* General * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/qtquick1.pro b/qtquick1.pro index 58c33f27..318861f4 100644 --- a/qtquick1.pro +++ b/qtquick1.pro @@ -1 +1,3 @@ +requires(qtHaveModule(widgets)) + load(qt_parts) diff --git a/sync.profile b/sync.profile index 9ad1263a..af38a344 100644 --- a/sync.profile +++ b/sync.profile @@ -8,12 +8,12 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/stable", - "qtscript" => "refs/heads/stable", - "qtxmlpatterns" => "refs/heads/stable", - "qtdeclarative" => "refs/heads/stable", - "qtjsbackend" => "refs/heads/stable", - "qtactiveqt" => "refs/heads/stable", - "qttools" => "refs/heads/stable", - "qtwebkit" => "refs/heads/stable", + "qtbase" => "refs/heads/old/5.0", + "qtscript" => "refs/heads/old/5.0", + "qtxmlpatterns" => "refs/heads/old/5.0", + "qtdeclarative" => "refs/heads/old/5.0", + "qtjsbackend" => "refs/heads/old/5.0", + "qtactiveqt" => "refs/heads/old/5.0", + "qttools" => "refs/heads/old/5.0", + "qtwebkit" => "refs/heads/old/5.0", ); |