diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2015-07-29 12:22:21 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-29 21:08:57 +0000 |
| commit | c3e58209d3601d86eeacde7abeeb39eb67a5aaf3 (patch) | |
| tree | 0d0c47e1901c9e38c0c302f1887681ca6ddc5c51 | |
| parent | 15bdc611bf372c818d47a400689ea4a0a4331f5c (diff) | |
Remove QTWEBKIT_VERSION left-overs
We removed QTWEBKIT_VERSION in Qt 5.0, but still document it and
still define the QTWEBKIT_VERSION_CHECK helper.
Change-Id: Iadbe0004224f3cef20a5d55a5ec8b46f04b387d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| -rw-r--r-- | Source/WebKit/qt/Api/qwebkitglobal.cpp | 45 | ||||
| -rw-r--r-- | Source/WebKit/qt/Api/qwebkitglobal.h | 2 |
2 files changed, 1 insertions, 46 deletions
diff --git a/Source/WebKit/qt/Api/qwebkitglobal.cpp b/Source/WebKit/qt/Api/qwebkitglobal.cpp index da9596322..b4dbb369e 100644 --- a/Source/WebKit/qt/Api/qwebkitglobal.cpp +++ b/Source/WebKit/qt/Api/qwebkitglobal.cpp @@ -34,8 +34,7 @@ and behaviour. The evolution of this version is bound to the releases of Apple's - Safari browser. For a version specific to the Qt WebKit module, - see QTWEBKIT_VERSION + Safari browser. \sa QWebPage::userAgentForUrl() */ @@ -71,45 +70,3 @@ int qWebKitMinorVersion() { return WEBKIT_MINOR_VERSION; } - -/*! - \macro QTWEBKIT_VERSION - \relates QWebPage - - This macro expands a numeric value of the form 0xMMNNPP (MM = - major, NN = minor, PP = patch) that specifies Qt WebKit's version - number. For example, if you compile your application against Qt WebKit - 2.1.2, the QTWEBKIT_VERSION macro will expand to 0x020102. - - You can use QTWEBKIT_VERSION to use the latest Qt WebKit API where - available. - - \sa QT_VERSION -*/ - -/*! - \macro QTWEBKIT_VERSION_STR - \relates QWebPage - - This macro expands to a string that specifies Qt WebKit's version number - (for example, "2.1.2"). This is the version against which the - application is compiled. - - \sa QTWEBKIT_VERSION -*/ - -/*! - \macro QTWEBKIT_VERSION_CHECK - \relates QWebPage - - Turns the major, minor and patch numbers of a version into an - integer, 0xMMNNPP (MM = major, NN = minor, PP = patch). This can - be compared with another similarly processed version id, for example - in a preprocessor statement: - - \code - #if QTWEBKIT_VERSION >= QTWEBKIT_VERSION_CHECK(2, 1, 0) - // code to use API new in Qt WebKit 2.1.0 - #endif - \endcode -*/ diff --git a/Source/WebKit/qt/Api/qwebkitglobal.h b/Source/WebKit/qt/Api/qwebkitglobal.h index 44e4d45b7..fe222c2fc 100644 --- a/Source/WebKit/qt/Api/qwebkitglobal.h +++ b/Source/WebKit/qt/Api/qwebkitglobal.h @@ -24,8 +24,6 @@ #include <QtCore/qglobal.h> #include <QtCore/qstring.h> -#define QTWEBKIT_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|(patch)) - #ifndef QT_STATIC # if !defined(QT_BUILD_WEBKITWIDGETS_LIB) && defined(BUILDING_WEBKIT) # define QWEBKIT_EXPORT Q_DECL_EXPORT |