Commit 4eb8676c authored by hausmann's avatar hausmann
Browse files

Added a make install target that installs the Qt port and renamed

WebKitQt to QtWebKit


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@23503 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent e413f96c
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.
......@@ -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
}
}
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
qtAddLibrary(QtWebKit)
QT += network
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.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment