diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2011-06-03 19:21:48 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2011-06-03 19:21:48 (GMT) |
| commit | 63186806ec04ea08d8ed1e4e9b8ed9d06b52190d (patch) | |
| tree | 1f2c9ab87df60a7c8f0b35609327679d374a3f8f /src | |
| parent | 5b90602785a2c147fe6c39f6f1e7cade8a4b5a82 (diff) | |
| download | Qt-63186806ec04ea08d8ed1e4e9b8ed9d06b52190d.zip Qt-63186806ec04ea08d8ed1e4e9b8ed9d06b52190d.tar.gz Qt-63186806ec04ea08d8ed1e4e9b8ed9d06b52190d.tar.bz2 | |
Some qmake black magic to pick up the right file.
I deleted the old hack of Andreas, it's not needed.
Reviewed-by: Andreas Kling
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/webkit/Source/Source.pro | 1 | ||||
| -rw-r--r-- | src/src.pro | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/Source/Source.pro b/src/3rdparty/webkit/Source/Source.pro deleted file mode 100644 index 38bf22d..0000000 --- a/src/3rdparty/webkit/Source/Source.pro +++ /dev/null @@ -1 +0,0 @@ -include(WebKit.pro) diff --git a/src/src.pro b/src/src.pro index efd1ac9..c8b6141 100644 --- a/src/src.pro +++ b/src/src.pro @@ -80,7 +80,7 @@ src_testlib.subdir = $$QT_SOURCE_TREE/src/testlib src_testlib.target = sub-testlib src_javascriptcore.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/JavaScriptCore src_javascriptcore.target = sub-javascriptcore -src_webkit.subdir = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/ +src_webkit.file = $$QT_SOURCE_TREE/src/3rdparty/webkit/Source/WebKit.pro src_webkit.target = sub-webkit src_declarative.subdir = $$QT_SOURCE_TREE/src/declarative src_declarative.target = sub-declarative |