diff options
author | Russell Brenner <russellbrenner@google.com> | 2010-11-18 17:33:13 -0800 |
---|---|---|
committer | Russell Brenner <russellbrenner@google.com> | 2010-12-02 13:47:21 -0800 |
commit | 6b70adc33054f8aee8c54d0f460458a9df11b8a5 (patch) | |
tree | 103a13998c33944d6ab3b8318c509a037e639460 /WebKitTools/MiniBrowser/qt/MiniBrowser.pro | |
parent | bdf4ebc8e70b2d221b6ee7a65660918ecb1d33aa (diff) | |
download | external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.zip external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.gz external_webkit-6b70adc33054f8aee8c54d0f460458a9df11b8a5.tar.bz2 |
Merge WebKit at r72274: Initial merge by git.
Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
Diffstat (limited to 'WebKitTools/MiniBrowser/qt/MiniBrowser.pro')
-rw-r--r-- | WebKitTools/MiniBrowser/qt/MiniBrowser.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebKitTools/MiniBrowser/qt/MiniBrowser.pro b/WebKitTools/MiniBrowser/qt/MiniBrowser.pro index e42c49a..82f6a00 100644 --- a/WebKitTools/MiniBrowser/qt/MiniBrowser.pro +++ b/WebKitTools/MiniBrowser/qt/MiniBrowser.pro @@ -51,3 +51,10 @@ contains(QT_CONFIG, opengl) { QT += opengl DEFINES += QT_CONFIGURED_WITH_OPENGL } + +# We have to copy the resource file to the build directory +# to use the useragentlist.txt file of QtTestBrowser without +# polluting the source tree. +# The copier is defined in WebKit2/DerivedSources.pro. +RESOURCES += \ + $$OUTPUT_DIR/WebKitTools/MiniBrowser/qt/MiniBrowser.qrc |