diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:02:10 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-04-11 17:25:40 +0200 |
commit | a257b0ee55c250889707bead9157076a3ff9b869 (patch) | |
tree | 37b707cd9e28de70e962fc4362ecbf0e3a40a779 | |
parent | f212e46fe930ee89a8cb52beeeccc03369c015a1 (diff) | |
parent | 1b02287e464efc999dda10ff57c0207e6f3648d5 (diff) | |
download | qttools-old/5.0.tar.gz |
Merge branch 'release' into old/5.0old/5.0
Conflicts:
src/assistant/assistant/assistant.pro
Change-Id: Ifa7d318f8482c09367388d6c9f848c4931a5ead7
-rw-r--r-- | dist/changes-5.0.2 | 25 | ||||
-rw-r--r-- | src/assistant/assistant/assistant.pro | 2 | ||||
-rw-r--r-- | sync.profile | 12 |
3 files changed, 32 insertions, 7 deletions
diff --git a/dist/changes-5.0.2 b/dist/changes-5.0.2 new file mode 100644 index 000000000..f29fa49c5 --- /dev/null +++ b/dist/changes-5.0.2 @@ -0,0 +1,25 @@ +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 * +**************************************************************************** + +General Improvements +-------------------- + + - This release contains only minor code improvements. diff --git a/src/assistant/assistant/assistant.pro b/src/assistant/assistant/assistant.pro index 25e423883..c054147b8 100644 --- a/src/assistant/assistant/assistant.pro +++ b/src/assistant/assistant/assistant.pro @@ -107,7 +107,7 @@ mac { QMAKE_INFO_PLIST = Info_mac.plist } -QTPLUGIN += qsqlite +contains(SQLPLUGINS, sqlite):QTPLUGIN += qsqlite target.path=$$[QT_INSTALL_BINS] INSTALLS += target diff --git a/sync.profile b/sync.profile index 5b4d9eea4..ac500e117 100644 --- a/sync.profile +++ b/sync.profile @@ -16,10 +16,10 @@ # - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch) # %dependencies = ( - "qtbase" => "refs/heads/stable", - "qtxmlpatterns" => "refs/heads/stable", - "qtdeclarative" => "refs/heads/stable", - "qtjsbackend" => "refs/heads/stable", - "qtactiveqt" => "refs/heads/stable", - "qtwebkit" => "refs/heads/stable", + "qtbase" => "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", + "qtwebkit" => "refs/heads/old/5.0", ); |