+2010-02-10 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
+ [Qt] Manually add support for the install target on Symbian.
+
+ This is required to copy the headers over the ones in Qt.
+
+ * WebKit.pro:
+
2010-02-11 Fridrich Strba <fridrich.strba@bluewin.ch>
Reviewed by Gustavo Noronha Silva.
Reviewed by Tor Arne Vestbø.
+ [Qt] Manually add support for the install target on Symbian.
+
+ This is required to copy the headers over the ones in Qt.
+
+ * WebCore.pro:
+
+2010-02-10 Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
+
+ Reviewed by Tor Arne Vestbø.
+
[Qt] Minor fixes on QtWebKit headers generation.
- Adds QtWebKit to the generated headers destination path
}
include(../include/QtWebKit/headers.pri)
-
-HEADERS += $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS
+HEADERS += $$WEBKIT_API_HEADERS
+WEBKIT_INSTALL_HEADERS = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS $$OUTPUT_DIR/include/headers.pri
!symbian {
+ headers.files = $$WEBKIT_INSTALL_HEADERS
+ headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
target.path = $$[QT_INSTALL_LIBS]
- INSTALLS += target
-}
-headers.files = $$WEBKIT_API_HEADERS $$WEBKIT_CLASS_HEADERS $$OUTPUT_DIR/include/headers.pri
-headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
-INSTALLS += headers
+ INSTALLS += target headers
+} else {
+ # INSTALLS is not implemented in qmake's s60 generators, copy headers manually
+ inst_headers.commands = $$QMAKE_COPY ${QMAKE_FILE_NAME} ${QMAKE_FILE_OUT}
+ inst_headers.input = WEBKIT_INSTALL_HEADERS
+ inst_headers.output = $$[QT_INSTALL_HEADERS]/QtWebKit/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
+ QMAKE_EXTRA_COMPILERS += inst_headers
+
+ install.depends += compiler_inst_headers_make_all
+ QMAKE_EXTRA_TARGETS += install
+}
# Qt will set the version for us when building in Qt's tree
!CONFIG(QTDIR_build): VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}
JavaScriptCore/qt/tests
}
+symbian {
+ # Forward the install target to WebCore. A workaround since INSTALLS is not implemented for symbian
+ install.commands = $(MAKE) -C WebCore install
+ QMAKE_EXTRA_TARGETS += install
+}
+
include(WebKit/qt/docs/docs.pri)