lp:~neon/qt/qtxmlpatterns
- Get this branch:
- bzr branch lp:~neon/qt/qtxmlpatterns
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://gitorious.org/qt/qtxmlpatterns.git.
Last successful import was .
Recent revisions
- 196. By Frederik Gladhorn <email address hidden>
-
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
- 195. By Jani Heikkinen <email address hidden>
-
Update copyright headers
Qt copyrights are now in The Qt Company, so we could update the source
code headers accordingly. In the same go we should also fix the links to
point to qt.io.Change-Id: I1dc468d4e08c2d
fdc4643410220f1 8bc8ec450b9
Reviewed-by: Antti Kokko <email address hidden> - 194. By Frederik Gladhorn <email address hidden>
-
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
- 193. By Kai Koehne <email address hidden>
-
Fix broken QSourceLocation autotest
The test relied on operator<<(QDebug, const QUrl &) adding unnecessary
spaces. This got fixed in qtbase commit 868201155.Change-Id: I75f71a82f6426d
a396c1634cecce3 b21e3ca8580
Reviewed-by: J-P Nurmi <email address hidden> - 192. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.confChange-Id: Id327fd1d5933b3
8c3fcc3f7e9edad b34aaf7a059 - 191. By Frederik Gladhorn <email address hidden>
-
Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/dev
- 190. By Kai Koehne <email address hidden>
-
Add support for QtInfoMsg
Replace the generic default label by the new QtInfoMsg enum, which got
added to Qt5Core.Change-Id: Ia56d24f29519d8
f9c8f184d74b772 92ecbb0bd4b
Reviewed-by: Oswald Buddenhagen <email address hidden>
Reviewed-by: Thiago Macieira <email address hidden> - 189. By Kai Koehne <email address hidden>
-
Add default label to QtMsgType switch statement
This enables us to add a new QtInfoMsg message type to qtbase
without breaking qtxmlpatterns.Change-Id: Ia4dcee9390eb6b
7fc02cf10067317 879e931a092
Reviewed-by: Oswald Buddenhagen <email address hidden>
Reviewed-by: Thiago Macieira <email address hidden> - 188. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I4a853063ea9aae
b5d7055d4652be6 faef468236e - 187. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I8b1548b720d241
259bb531b4742ac 92d93788855
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)