From bf9ae9018e063e3f002588e31b1b4f9f66926408 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Fri, 29 Mar 2013 12:43:38 +0800 Subject: Doc: Give C++ class lists consistent titles The majority format is " C++ Classes" (see http://qt-project.org/doc/qt-5.0/qtdoc/modules-cpp.html) Also, fix a broken link (Qt Network C++ Classes) " C++ API" is perhaps the more correct format, but that's part of a much bigger cleanup: QTBUG-30556 Change-Id: I753365e2bec8d85d9a5f686b4aa35c9eeeaf0871 Reviewed-by: Jerome Pasion --- src/network/doc/src/network-programming.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/network') diff --git a/src/network/doc/src/network-programming.qdoc b/src/network/doc/src/network-programming.qdoc index f236948b57..821b0ada15 100644 --- a/src/network/doc/src/network-programming.qdoc +++ b/src/network/doc/src/network-programming.qdoc @@ -51,7 +51,7 @@ \section1 Qt's Classes for Network Programming - The \l{Qt Network - C++ Classes} page contains a list of the C++ classes + The \l{Qt Network C++ Classes} page contains a list of the C++ classes in Qt Network. \section1 High Level Network Operations for HTTP and FTP -- cgit v1.2.3 From 522c7ba1acaa02904e810662017b19e55c328d11 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Fri, 26 Apr 2013 16:23:16 +0200 Subject: Enable bundling Qt in Android package in build system For bundling Qt, we need two things: 1. We need to build a regular .jar file out of the Java files, so that they can be built into the app package. Dexing the classes first (i.e. compiling the JVM bytecode to Dalvik bytecode) is required for loading the .jar file at run-time, but cannot be used for building it into the app, so we need two different paths. 2. We need to specify which extra files have to be bundled for each module (this is primarily for plugins and imports). This is because there is no static dependency on these files, so it cannot be detected during deployment. Task-number: QTBUG-30751 Change-Id: I733603ee5d1c64bd7c5b9357eb5d993b9d0298f7 Reviewed-by: Paul Olav Tvete Reviewed-by: Oswald Buddenhagen --- src/network/network.pro | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/network') diff --git a/src/network/network.pro b/src/network/network.pro index d2b2447611..79e357e0cb 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -11,6 +11,9 @@ DEFINES += QT_NO_USING_NAMESPACE #DEFINES += QUDPSOCKET_DEBUG QUDPSERVER_DEBUG win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x64000000 +MODULE_PLUGIN_TYPES = \ + bearer + QMAKE_DOCS = $$PWD/doc/qtnetwork.qdocconf load(qt_module) -- cgit v1.2.3