Title: [89137] trunk/Source/WebKit/qt
- Revision
- 89137
- Author
- alexis.men...@openbossa.org
- Date
- 2011-06-17 08:08:09 -0700 (Fri, 17 Jun 2011)
Log Message
2011-06-17 Alexis Menard <alexis.men...@openbossa.org>
Reviewed by Andreas Kling.
[Qt] Fix wrong framework generation on MacOS when inside Qt 4.8.
https://bugs.webkit.org/show_bug.cgi?id=62815
Partially revert r85870 which assumed that QtWebKit will never be build inside Qt
anymore. Everything inside !QTDIR_build condition is not needed in the Qt tree because
qbase.pri is doing the job for us, i.e. using includes generated by syncqt to
setup the mac framework. It also use a correct QMAKE_LFLAGS_SONAME making possible
to actually run an application linked against QtWebKit.
* QtWebKit.pro:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (89136 => 89137)
--- trunk/Source/WebKit/qt/ChangeLog 2011-06-17 15:06:29 UTC (rev 89136)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-06-17 15:08:09 UTC (rev 89137)
@@ -1,3 +1,18 @@
+2011-06-17 Alexis Menard <alexis.men...@openbossa.org>
+
+ Reviewed by Andreas Kling.
+
+ [Qt] Fix wrong framework generation on MacOS when inside Qt 4.8.
+ https://bugs.webkit.org/show_bug.cgi?id=62815
+
+ Partially revert r85870 which assumed that QtWebKit will never be build inside Qt
+ anymore. Everything inside !QTDIR_build condition is not needed in the Qt tree because
+ qbase.pri is doing the job for us, i.e. using includes generated by syncqt to
+ setup the mac framework. It also use a correct QMAKE_LFLAGS_SONAME making possible
+ to actually run an application linked against QtWebKit.
+
+ * QtWebKit.pro:
+
2011-06-16 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r88796.
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (89136 => 89137)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-06-17 15:06:29 UTC (rev 89136)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-06-17 15:08:09 UTC (rev 89137)
@@ -304,62 +304,64 @@
QMAKE_EXTRA_TARGETS += install
}
-exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri)
-WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
+!CONFIG(QTDIR_build) {
+ exists($$OUTPUT_DIR/include/QtWebKit/classheaders.pri): include($$OUTPUT_DIR/include/QtWebKit/classheaders.pri)
+ WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
-!symbian-abld:!symbian-sbsv2 {
- headers.files = $$WEBKIT_INSTALL_HEADERS
+ !symbian-abld:!symbian-sbsv2 {
+ headers.files = $$WEBKIT_INSTALL_HEADERS
- !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit
- else: headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
+ !isEmpty(INSTALL_HEADERS): headers.path = $$INSTALL_HEADERS/QtWebKit
+ else: headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
- !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS
- else: target.path = $$[QT_INSTALL_LIBS]
+ !isEmpty(INSTALL_LIBS): target.path = $$INSTALL_LIBS
+ else: target.path = $$[QT_INSTALL_LIBS]
- INSTALLS += target headers
-} else {
- # INSTALLS is not implemented in qmake's mmp generators, copy headers manually
- inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
- inst_headers.input = WEBKIT_INSTALL_HEADERS
- inst_headers.CONFIG = no_clean
+ INSTALLS += target headers
+ } else {
+ # INSTALLS is not implemented in qmake's mmp generators, copy headers manually
+ inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+ inst_headers.input = WEBKIT_INSTALL_HEADERS
+ inst_headers.CONFIG = no_clean
- !isEmpty(INSTALL_HEADERS): inst_headers.output = $$INSTALL_HEADERS/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
- else: inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
+ !isEmpty(INSTALL_HEADERS): inst_headers.output = $$INSTALL_HEADERS/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
+ else: inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
- QMAKE_EXTRA_COMPILERS += inst_headers
+ QMAKE_EXTRA_COMPILERS += inst_headers
- install.depends += compiler_inst_headers_make_all
-}
+ install.depends += compiler_inst_headers_make_all
+ }
-unix {
- CONFIG += create_pc create_prl
- QMAKE_PKGCONFIG_LIBDIR = $$target.path
- QMAKE_PKGCONFIG_INCDIR = $$headers.path
- QMAKE_PKGCONFIG_DESTDIR = pkgconfig
- lib_replace.match = $$re_escape($$DESTDIR)
- lib_replace.replace = $$[QT_INSTALL_LIBS]
- QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
-}
+ unix {
+ CONFIG += create_pc create_prl
+ QMAKE_PKGCONFIG_LIBDIR = $$target.path
+ QMAKE_PKGCONFIG_INCDIR = $$headers.path
+ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+ lib_replace.match = $$re_escape($$DESTDIR)
+ lib_replace.replace = $$[QT_INSTALL_LIBS]
+ QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
+ }
-mac {
- !static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
- !build_pass {
- message("Building QtWebKit as a framework, as that's how Qt was built. You can")
- message("override this by passing CONFIG+=webkit_no_framework to build-webkit.")
+ mac {
+ !static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
+ !build_pass {
+ message("Building QtWebKit as a framework, as that's how Qt was built. You can")
+ message("override this by passing CONFIG+=webkit_no_framework to build-webkit.")
- CONFIG += build_all
- } else {
- isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
+ CONFIG += build_all
+ } else {
+ isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
+ }
+
+ CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
+ FRAMEWORK_HEADERS.version = Versions
+ FRAMEWORK_HEADERS.files = $${headers.files}
+ FRAMEWORK_HEADERS.path = Headers
+ QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
}
- CONFIG += lib_bundle qt_no_framework_direct_includes qt_framework
- FRAMEWORK_HEADERS.version = Versions
- FRAMEWORK_HEADERS.files = $${headers.files}
- FRAMEWORK_HEADERS.path = Headers
- QMAKE_BUNDLE_DATA += FRAMEWORK_HEADERS
+ QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}"
}
-
- QMAKE_LFLAGS_SONAME = "$${QMAKE_LFLAGS_SONAME}$${DESTDIR}$${QMAKE_DIR_SEP}"
}
symbian {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
