lp:~neon/qt/qtscript
- Get this branch:
- bzr branch lp:~neon/qt/qtscript
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://gitorious.org/qt/qtscript.git.
Last successful import was .
Recent revisions
- 251. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into 5.5
Change-Id: I09519da51f8c3c
bc927f64f9b1bd7 de14b8a1854 - 250. By Frederik Gladhorn <email address hidden>
-
Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into refs/staging/5.5
- 249. By Sergio Ahumada <email address hidden>
-
Fix BSD license header
Change-Id: Id8f996f2861884
5a8b253f5162bec 7df98921ef0
Reviewed-by: Jani Heikkinen <email address hidden> - 248. By Jani Heikkinen <email address hidden>
-
Fixed license headers
Change-Id: I99e62a707fe649
403214436a4b9aa d8fd82015ee
Reviewed-by: Iikka Eklund <email address hidden> - 247. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ic32f5bd1778228
5305aaa01694f1a 78851b882eb - 246. 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: Iffc10aac2cdaf7
c7ceba051ec447f 15758c3d8e0
Reviewed-by: Sergio Ahumada <email address hidden> - 245. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.confChange-Id: I7b5322df406806
14250e1e6327879 ff683c03df5 - 244. By Thiago Macieira <email address hidden>
-
Replace Q_STATIC_
GLOBAL_ OPERATOR with its expansion This existed to work around compiler bugs with RVCT. Let's assume anyone
still using RVCT is using a newer version.Change-Id: Ic1c1a8b13e0e1d
4393c701a6c308d f37e80da555
Reviewed-by: Olivier Goffart <email address hidden> - 243. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.confChange-Id: Ib2bcdfc23e0e82
74e8cc43ed34ec3 4b1e0cb986d - 242. By Frederik Gladhorn <email address hidden>
-
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I80f2ea26633997
a728eab832fe53e e9f69daf2bc
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)