| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I23bc6a2f8734b34ab5193a3ebcbebde3c98b2611
|
|
|
|
| |
Change-Id: I9c9d3330bf75912b55a99f2bb88822b1cefb0f5e
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/webchannel/doc/src/index.qdoc
src/webchannel/qwebchannelabstracttransport.cpp
Overlapping changes to documentation; constructed hybrid.
src/webchannel/qmetaobjectpublisher.cpp
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Both sides made additions; in the same place.
Change-Id: Iff12970978b70946dc3e1290841aca2d35c9c1d0
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Alleged Conflicts:
examples/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
examples/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
examples/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc
In each case, the two sides agreed byte-for-byte.
Not quite sure what git thought the conflict was !
Change-Id: I5da9695b667f4112848c520b630ab1304d61cea3
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
it's done centrally now.
Change-Id: I0922b2083b594cdf61f4606fe17c9c61c0d4683a
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | |
| | |
| | |
| | | |
Change-Id: I73f3738a4ba90af8bc8572edecda56bec7d1f60b
|
| | |
| | |
| | |
| | | |
Change-Id: I7c7c1a8702698b9b37752eaa7cb5d676857b9be8
|
|/ /
| |
| |
| | |
Change-Id: I88a9000f1bba81e35ad45e768244fda4f8df469a
|
|/
|
|
| |
Change-Id: I631db196a1969efc3f45678f00819ac8105e9c82
|
|
|
|
| |
Change-Id: I61e5bc4b85f9456b0e3f0084027104d6ace56e70
|
|
|
|
| |
Change-Id: I1d56bb01e6c9997eb7eba45e9d804109a3cb6384
|
|
|
|
|
|
|
|
| |
This module will be shipped with Qt 5.4.0, so set the version
accordingly. Furthermore, the warning_clean flag is added to CONFIG.
Change-Id: Id8936dc496bf585f838842bcc29fff238523927b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
This module can hopefully be done in time for 5.3. This commit changes
the source structure and QMake files to adapt to typical Qt modules.
With this in place, we can now use QT += webchannel in qmake files to
link against the pure Qt/C++ QtWebChannel library.
The QML plugin is separated from it and can be loaded optionally, if
the quick module could be found. Also added is now a qmlplugindump
for tooling integration. Note that the Qt.labs namespace is removed.
The test file structure is also adapted to how its done in the
QtDeclarative module.
Note that this setup apparently does not support to run tests without
running make install first.
Change-Id: I1c15d72e7ab5f525d5a6f651f4e965ef86bc17bd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|