Added a make install target that installs the Qt port and renamed
authorhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2007 14:38:36 +0000 (14:38 +0000)
committerhausmann <hausmann@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 13 Jun 2007 14:38:36 +0000 (14:38 +0000)
WebKitQt to QtWebKit

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23503 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/WebCore.pro
WebKitQt/Api/headers.pri [new file with mode: 0644]
WebKitQt/Api/qtwebkit.prf [new file with mode: 0644]
WebKitQt/ChangeLog

index d3c7dbc97c11e27991df1a451b0264006bc2781d..1f6b52346578d0e5de58d43fddb10ae3fbb43d74 100644 (file)
@@ -1,3 +1,12 @@
+2007-06-13  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Added a make install target that installs the Qt port and renamed
+        WebKitQt to QtWebKit
+
+        * WebCore.pro:
+
 2007-06-13  Adam Roben  <aroben@apple.com>
 
         Fix one more BITMAPINFO/BITMAPINFOHEADER typo.
index 4625763fba5e43438fad70806d7fecd226694aa8..d1a88a7656a6aa2cb73f4ff6bf9d0ce33d6a1ca7 100644 (file)
@@ -5,7 +5,7 @@ qt-port:LIBS -= -lWebKitQt
 gdk-port:LIBS -= -lWebKitGdk
 
 TEMPLATE = lib
-qt-port:TARGET = WebKitQt
+qt-port:TARGET = QtWebKit
 gdk-port:TARGET = WebKitGdk
 OBJECTS_DIR = tmp
 INCLUDEPATH += tmp $$OUTPUT_DIR/WebCore/tmp
@@ -16,13 +16,6 @@ DEPENDPATH += css dom loader editing history html \
 
 include($$OUTPUT_DIR/config.pri)
 
-unix {
-    CONFIG += create_pc create_prl
-    QMAKE_PKGCONFIG_LIBDIR = $$DESTDIR
-    QMAKE_PKGCONFIG_INCDIR = $$PWD/../WebKitQt/Api
-    QMAKE_PKGCONFIG_DESTDIR = pkgconfig
-}
-
 CONFIG -= warn_on
 QMAKE_CXXFLAGS += -Wreturn-type
 #QMAKE_CXXFLAGS += -Wall -Wno-undef -Wno-unused-parameter
@@ -1416,4 +1409,24 @@ xpathbison.variable_out = GENERATED_SOURCES
 xpathbison.clean = ${QMAKE_FILE_OUT} tmp/${QMAKE_FILE_BASE}.h
 QMAKE_EXTRA_COMPILERS += xpathbison
 
+qt-port {
+    target.path = $$[QT_INSTALL_LIBS]
+    include($$PWD/../WebKitQt/Api/headers.pri)
+    headers.files = $$WEBKIT_API_HEADERS
+    headers.path = $$[QT_INSTALL_HEADERS]/QtWebKit
+    prf.files = $$PWD/../WebKitQt/Api/qtwebkit.prf
+    prf.path = $$[QT_INSTALL_PREFIX]/mkspecs/features
+
+    INSTALLS += target headers prf
+
+    unix {
+        CONFIG += create_pc create_prl
+        QMAKE_PKGCONFIG_LIBDIR = $$target.path
+        QMAKE_PKGCONFIG_INCDIR = $$headers.path
+        QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+        lib_replace.match = $$DESTDIR
+        lib_replace.replace = $$[QT_INSTALL_LIBS]
+        QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace
+    }
+}
 
diff --git a/WebKitQt/Api/headers.pri b/WebKitQt/Api/headers.pri
new file mode 100644 (file)
index 0000000..6331384
--- /dev/null
@@ -0,0 +1,9 @@
+WEBKIT_API_HEADERS = $$PWD/qcookiejar.h \
+                     $$PWD/qwebframe.h \
+                     $$PWD/qwebkitglobal.h \
+                     $$PWD/qwebnetworkinterface.h \
+                     $$PWD/qwebobjectplugin.h \
+                     $$PWD/qwebobjectpluginconnector.h \
+                     $$PWD/qwebpage.h \
+                     $$PWD/qwebpagehistory.h \
+                     $$PWD/qwebsettings.h
diff --git a/WebKitQt/Api/qtwebkit.prf b/WebKitQt/Api/qtwebkit.prf
new file mode 100644 (file)
index 0000000..37417c6
--- /dev/null
@@ -0,0 +1,4 @@
+
+qtAddLibrary(QtWebKit)
+
+QT += network
index ef32328fed43976a5d86503fb3d550efe7fda112..f5913518198272a979609a5d5140dfc4f06fed1a 100644 (file)
@@ -1,3 +1,13 @@
+2007-06-13  Simon Hausmann  <hausmann@kde.org>
+
+        Reviewed by Lars.
+
+        Added a make install target that installs the Qt port and renamed
+        WebKitQt to QtWebKit
+
+        * Api/headers.pri: Added.
+        * Api/qtwebkit.prf: Added.
+
 2007-06-13  Simon Hausmann  <hausmann@kde.org>
 
         Reviewed by Lars.