diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2012-12-06 17:23:10 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 09:34:16 +0100 |
commit | 01c87456678611164da119ac5ff486852f64d1fa (patch) | |
tree | 47117de3e17a06a25502a60204465692341cf9b4 | |
parent | 2a13be12942ede34637cf22b043ccb04e964d52b (diff) |
Document QtWebKit source breaks.
Change-Id: I681465106410c40528548bb09ae50573062232ef
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r-- | doc/src/source-breaks.qdoc | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/doc/src/source-breaks.qdoc b/doc/src/source-breaks.qdoc index 6b3d0f2df..d6bcd027c 100644 --- a/doc/src/source-breaks.qdoc +++ b/doc/src/source-breaks.qdoc @@ -257,6 +257,35 @@ The following sections lists the API changes in each module and provides recomme their second parameter instead of \c{QRgb}. \endlist +\section1 Changes to Qt WebKit + \list + \li The WebKit module in Qt is now split in two modules, \c{webkit} and \c{webkitwidgets}, in order to allow the dependency of + the \c{widgets} module to be optional. The benefits will only be profitable once the QQuickWebView API are made public + through C++ in a future version. The \c{webkitwidgets} module adds the \c{webkit} module automatically to the project, + so in your application's project file, \c{QT += webkit} should now be modified to: + \code + QT += webkitwidgets + \endcode + \li The same applies to the module include, \c{#include <QtWebKit/QtWebKit>} should be modified to: + \code + #include <QtWebKitWidgets/QtWebKitWidgets> + \endcode + \li A consequence of the module split is that classes of the QtWebKit API aren't all in the new module, so for a better + compatibility of your application with both Qt4 and Qt5, #include <QtWebKit/QWebPage>, for example, should be included + directly as: + \code + #include <QWebPage> + \endcode + The include path will take care of selecting the right module. + \li The qwebkitversion.h header has been renamed to q\b{t}webkitversion.h to match other Qt modules, and part of its + contents has been moved to qwebkitglobal.h. \c{#include <qwebkitversion.h>} should be replaced with + two includes: + \code + #include <qtwebkitversion.h> + #include <qwebkitglobal.h> + \endcode + \endlist + \section1 Changes to Qt Print Support \list \li The \l{QPageSetupDialog::PageSetupDialogOption} enum and the corresponding set and get functions, \c{QPageSetupDialog::options()} |