Summary: | [Qt] Fix compilation on Maemo5 | ||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|
Product: | WebKit | Reporter: | Simon Hausmann <hausmann> | ||||||||
Component: | New Bugs | Assignee: | Simon Hausmann <hausmann> | ||||||||
Status: | RESOLVED FIXED | ||||||||||
Severity: | Normal | CC: | eric, laszlo.gombos | ||||||||
Priority: | P2 | ||||||||||
Version: | 528+ (Nightly build) | ||||||||||
Hardware: | Other | ||||||||||
OS: | OS X 10.5 | ||||||||||
Attachments: |
|
Description
Simon Hausmann
2010-01-24 02:07:16 PST
Created attachment 47290 [details]
Patch
Created attachment 47294 [details]
Patch
Symbian port of Qt does not come with uitools either. I think Maemo5 and Symbian should have the same solution for this. Maybe a simple line WebKit.pri would do ? @@ -77,6 +77,8 @@ QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS } +maemo5: DEFINES *= QT_NO_UITOOLS + contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools A while back I proposed to create a mobile profile for QtWebKit to combine Maemo5, Symbian and perhaps WinCE and embedded. Maybe it would be a good time to introduce that ? (In reply to comment #3) > Symbian port of Qt does not come with uitools either. I think Maemo5 and > Symbian should have the same solution for this. Maybe a simple line WebKit.pri > would do ? > > @@ -77,6 +77,8 @@ > QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS > } > > +maemo5: DEFINES *= QT_NO_UITOOLS > + > contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools Ohh, you're right, that's better. I didn't see that the fix for Symbian was done there, I thought uitools was built there. Ok, I'll fix it :) > > A while back I proposed to create a mobile profile for QtWebKit to combine > Maemo5, Symbian and perhaps WinCE and embedded. Maybe it would be a good time > to introduce that ? Yeah, in the long run we need that. I'd like to see that come out of Qt. Comment on attachment 47294 [details]
Patch
Clearning review. Alternate fix coming up
Created attachment 47337 [details]
Patch
Comment on attachment 47337 [details]
Patch
lgtm.
Attachment 47337 [details] was posted by a committer and has review+, assigning to Simon Hausmann for commit.
|