Bug 97653

Summary: QTWEBKIT_VERSION_STR defined twice
Product: WebKit Reporter: Joerg Bornemann <joerg.bornemann>
Component: WebKit QtAssignee: Nobody <webkit-unassigned>
Status: RESOLVED INVALID    
Severity: Normal CC: allan.jensen, hausmann
Priority: P2    
Version: 528+ (Nightly build)   
Hardware: All   
OS: All   
URL: https://bugreports.qt-project.org/browse/QTWEBKIT-380
Attachments:
Description Flags
fix
joerg.bornemann: review-
fix none

Joerg Bornemann
Reported 2012-09-26 03:10:55 PDT
Two WebKit macros are defined twice, to different versions, in Qt 5.0b2: /Developer/Qt/5.0.0/include/QtWebKit/qwebkitglobal.h #define QTWEBKIT_VERSION_STR "2.2.0" #define QTWEBKIT_VERSION 0x020200 /Developer/Qt/5.0.0/include/QtWebKit/qtwebkitversion.h #define QTWEBKIT_VERSION_STR "5.0.0" #define QTWEBKIT_VERSION 0x050000
Attachments
fix (2.30 KB, patch)
2012-09-26 03:32 PDT, Joerg Bornemann 		joerg.bornemann: review-
DetailsFormatted DiffDiff
fix (3.44 KB, patch)
2012-09-26 07:49 PDT, Joerg Bornemann 		no flags
DetailsFormatted DiffDiff
Show Obsolete (1) View All Add attachment proposed patch, testcase, etc.
Joerg Bornemann
Comment 1 2012-09-26 03:32:39 PDT
Created attachment 165764 [details] fix
Allan Sandfeld Jensen
Comment 2 2012-09-26 04:02:29 PDT
Hmm, they are actually two different versions. One if the library version which matches that of Qt, the other is the QtWebKit API version which should probably be 2.3 or 3.0.
Joerg Bornemann
Comment 3 2012-09-26 04:21:53 PDT
The file qtwebkitversion.h gets automatically generated from Source/QtWebKit.pro which includes api.pri, where the Qt module specific stuff is defined. I take that QTWEBKIT_VERSION in qwebkitglobal.h is the authorative source of the version number (2.2.0 in the current version of qt 5). That's why I've set the VERSION in api.pri to 2.2.0. Unfortunately I was a bit quick with this patch. I cannot just include qtwebkitversion.h in qwebkitglobal.h. :-/
Joerg Bornemann
Comment 4 2012-09-26 04:22:26 PDT
Comment on attachment 165764 [details] fix broken :-(
Joerg Bornemann
Comment 5 2012-09-26 07:49:18 PDT
Created attachment 165800 [details] fix I had to alter the INCLUDEPATH to have qtwebkitversion.h found. Not a solution I like... but it works.
Alexey Proskuryakov
Comment 6 2022-07-29 10:45:32 PDT
The Qt port has been removed from WebKit, resolving.
Note You need to log in before you can comment on or make changes to this bug.