Skip to content

Instantly share code, notes, and snippets.

@torarnv
Created June 10, 2009 15:23
Show Gist options
  • Save torarnv/127280 to your computer and use it in GitHub Desktop.
Save torarnv/127280 to your computer and use it in GitHub Desktop.
diff --git i/webkittrunk.pri w/webkittrunk.pri
index c08131f..58f2be4 100644
--- i/webkittrunk.pri
+++ w/webkittrunk.pri
@@ -8,19 +8,18 @@ webkit_trunk {
WEBKITDIR = $$(WEBKITDIR)
WEBKITBRANCH = $$(WEBKITBRANCH)
isEmpty(WEBKITBRANCH) {
- CONFIG(release):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/Release/lib
- CONFIG(debug):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/Debug/lib
+ CONFIG(release):OUTPUT_DIR = $$WEBKITDIR/WebKitBuild/Release
+ CONFIG(debug):OUTPUT_DIR = $$WEBKITDIR/WebKitBuild/Debug
} else {
- CONFIG(release):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/$$WEBKITBRANCH/Release/lib
- CONFIG(debug):WEBKITBUILD = $$WEBKITDIR/WebKitBuild/$$WEBKITBRANCH/Debug/lib
+ CONFIG(release):OUTPUT_DIR = $$WEBKITDIR/WebKitBuild/$$WEBKITBRANCH/Release
+ CONFIG(debug):OUTPUT_DIR = $$WEBKITDIR/WebKitBuild/$$WEBKITBRANCH/Debug
}
message(Using WebKit Trunk at $$WEBKITDIR)
- message(Using WebKit Build at $$WEBKITBUILD)
+ message(Using WebKit Build at $$OUTPUT_DIR)
+
QT -= webkit
DEFINES += WEBKIT_TRUNK
- QMAKE_LIBDIR_FLAGS = -L$$WEBKITBUILD
- LIBS = -L$$WEBKITBUILD -lQtWebKit
- INCLUDEPATH = $$WEBKITDIR/WebKit/qt/Api $$INCLUDEPATH
- QMAKE_RPATHDIR = $$WEBKITBUILD $$QMAKE_RPATHDIR
+ include($$WEBKITDIR/WebKit.pri)
+ QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment