Merge lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th into lp:zorba
Proposed by
Sorin Marian Nasoi
Status: | Merged |
---|---|
Merged at revision: | 11582 |
Proposed branch: | lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th |
Merge into: | lp:zorba |
Diff against target: |
135 lines (+22/-34) 7 files modified
test/fots/CMakeLists.txt (+1/-1) test/fots/ImportFOTS.cmake (+2/-2) test/fots_driver/FOTSZorbaManifest.xml (+6/-0) test/fots_driver/environment.xq (+0/-19) test/fots_driver/fots-driver.xq (+1/-12) test/fots_driver/reporting/XQ10/FOTSZorbaManifest.xml (+6/-0) test/fots_driver/reporting/XQ30/FOTSZorbaManifest.xml (+6/-0) |
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bump_QT_snapshot_August_8th |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Approve | ||
Sorin Marian Nasoi | Approve | ||
Review via email: mp+178571@code.launchpad.net |
Commit message
- bumped QT snapshot to August 5th
- removed the environment checking for the default collection and collations other tahn Unicode Codepoint Collection
- added necessary dependencies in FOTSZorbaManifest for 'non_unicode_
To post a comment you must log in.
Validation queue starting for the following merge proposals: /code.launchpad .net/~zorba- coders/ zorba/bump_ QT_snapshot_ August_ 8th/+merge/ 178571
https:/
Progress dashboard at http:// jenkins. lambda. nu/view/ ValidationQueue