qt/qtdeclarative.git/sync.profile, branch wip/webassembly

fix QtQmlDevTools in framework builds in a better way

2017-04-11T16:48:03+00:00

6767fcfaf basically gave up and gave the module an own set of headers.
however, we now have improved infrastructure for borrowing headers.
while this may look uglier, the maintenance burden is lower, and it's
consistent with other bootstrapped modules.

Change-Id: I6ddcbbc01fa085a3c6bf333b03a9fdfc19061836
Reviewed-by: Joerg Bornemann 
Reviewed-by: Ulf Hermann

Merge remote-tracking branch 'origin/5.6' into 5.7

2016-11-15T09:57:49+00:00

Conflicts:
	src/qmldevtools/qmldevtools.pro
	tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp

Change-Id: I12255c16716bd8a74e7047cdb1f9302a4d1ea827

remove dependencies from sync.profile

2016-11-05T21:05:01+00:00

the CI obtains them from the qt5 super repo nowadays.

Change-Id: I1be0b8a494a5f7db02fa82ec46de2ec3573dd485
Reviewed-by: Jędrzej Nowacki

Move QQmlDebugClient into separate static library

2015-10-30T19:05:07+00:00

Change-Id: Ib3daf9da2cf6798bd022cfcf54d11e565c9cb4ca
Reviewed-by: Simon Hausmann

Put QPacketProtocol into its own static library

2015-10-15T08:23:15+00:00

We need it in 3 places in qtdeclarative and we could also use it in
QtCreator. We don't want to bundle it with the debug client code as it
is also necessary for the server.

QPacket replaces QQmlDebugStream as it has the same purpose. This
also fixes the inconsitent handling of data stream versions.

Change-Id: I650fae353f267511c551b427d9169f4d718aa7f2
Reviewed-by: Simon Hausmann

Merge remote-tracking branch 'origin/5.5' into dev

2015-03-17T08:52:19+00:00

Change-Id: I6033aba359ac551f450ad517d20a0986bf4655f6

Fix usage of QtQmlDevTools private headers on OSX with framework builds

2015-03-16T10:27:07+00:00

Previously this module borrowed its private headers from QtQml, so that
when writing QT += qmldevtools-private, you'd get the private headers from
QtQml. This doesn't work when QtQml is built as a framework.

A cleaner solution is to give this module its headers proper by letting
syncqt create the forwarding headers correctly (and consequently also
include them in make install). In order for this to work, the included
headers themselves cannot include any headers from QtQml, which this
patch also takes care of, through a centralized inclusion of qv4global_p.h.

Change-Id: I9bb8337956a2774cfaca6b338369face6c6ee785
Reviewed-by: Oswald Buddenhagen 
Reviewed-by: Frederik Gladhorn

Update glyph cache type/format logic to match qtbase changes

2014-02-20T01:03:48+00:00

https://codereview.qt-project.org/#change,77791 unified the glyph format
between QFontEngine and QFontEngineGlyphCache.

Now that we're up to date with qtbase, we can unpin the dependency.

Change-Id: Ibcafccb741ce94b454ff7c469804f44fef7fe06f
Reviewed-by: Simon Hausmann

Pin qtbase to merge from dev while we integrate glyph cache changes

2014-02-19T16:23:21+00:00

Change-Id: I4ab46977ec0f137e2bb5a41c67dc09ee962a8b82
Reviewed-by: Simon Hausmann

Unpin qtbase in preperation for merge to stable

2014-02-17T20:47:51+00:00

Change-Id: I833937c85269dfaca7f28fd06c3f55729037b800
Reviewed-by: Simon Hausmann