Bug 34975 - [Qt] Correct build problems while building QtWebKit inside Qt.
Summary: [Qt] Correct build problems while building QtWebKit inside Qt.
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Enhancement
Assignee: Nobody
URL:
Keywords: Qt
Depends on:
Blocks:
 
Reported: 2010-02-16 04:13 PST by Jocelyn Turcotte
Modified: 2010-02-23 01:59 PST (History)
1 user (show)

See Also:

Attachments
Patch (1.72 KB, patch)
2010-02-16 05:05 PST, Jocelyn Turcotte 		no flags Details | Formatted Diff | Diff
Patch v2 (1.70 KB, patch)
2010-02-17 01:44 PST, Jocelyn Turcotte 		laszlo.gombos: review+
Details | Formatted Diff | Diff
Show Obsolete (1) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Jocelyn Turcotte 2010-02-16 04:13:11 PST 
Building QtWebKit inside Qt's src/3rdparty had some issues
Comment 1 Jocelyn Turcotte 2010-02-16 05:05:25 PST 
Created attachment 48806 [details]
Patch

Patch that corrects the problem.
Comment 2 Laszlo Gombos 2010-02-16 16:08:24 PST 
Can we replace
+        !CONFIG(QTDIR_build): TARGET = $$qtLibraryTarget($$TARGET)
with 
+        TARGET = $$qtLibraryTarget($$TARGET)

These rules are already complex enough, let's try to keep them as simple as possible.
Comment 3 Jocelyn Turcotte 2010-02-17 01:44:15 PST 
Created attachment 48869 [details]
Patch v2

(In reply to comment #2)

Thanks, I missed that one, here is the new patch
Comment 4 Laszlo Gombos 2010-02-17 14:38:32 PST 
Comment on attachment 48869 [details]
Patch v2

Looks good to me, r+.

It would be better to assign value to VERSION at same location. Perhaps you can make that change during landing just by moving some code around.

Something like this:

CONFIG(QTDIR_build) {
    include($$QT_SOURCE_TREE/src/qbase.pri)
    # Qt will set the version for us when building in Qt's tree
    VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
} else: VERSION = 4.7.0
Comment 5 Jocelyn Turcotte 2010-02-23 01:59:10 PST 
Landed in r55133.
Closing bug.