diff options
| author | hausmann@webkit.org <hausmann@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-15 14:06:06 +0000 |
|---|---|---|
| committer | hausmann@webkit.org <hausmann@webkit.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-10-15 14:06:06 +0000 |
| commit | e6d3687bcb46990502536fa62470945f05bb361b (patch) | |
| tree | 72ab6570ad34affac73c99857be23c03c18cc71c /third_party/WebKit/Tools/qmake | |
| parent | 2ecc2ff7a4de72d8bda59e77b83ce04a450bf8fa (diff) | |
| download | chromium_src-e6d3687bcb46990502536fa62470945f05bb361b.zip chromium_src-e6d3687bcb46990502536fa62470945f05bb361b.tar.gz chromium_src-e6d3687bcb46990502536fa62470945f05bb361b.tar.bz2 | |
[Qt] Separate Qt WebKit into Qt WebKit and Qt WebKit Widgets
https://bugs.webkit.org/show_bug.cgi?id=88162
Reviewed by Kenneth Rohde Christiansen.
Rename the QtWebKit module to QtWebKitWidgets.
.:
* Source/api.pri:
* Source/sync.profile:
Source/WebKit/qt:
* declarative/experimental/experimental.pri:
* declarative/public.pri:
* docs/webkitsnippets/simple/simple.pro:
* docs/webkitsnippets/webpage/webpage.pro:
* tests/tests.pri:
Source/WebKit2:
* PluginProcess.pro:
* UIProcess/API/qt/tests/inspectorserver/inspectorserver.pro:
* UIProcess/API/qt/tests/publicapi/publicapi.pro:
* UIProcess/API/qt/tests/qmltests/DesktopBehavior.pro:
* UIProcess/API/qt/tests/qmltests/WebView.pro:
* UIProcess/API/qt/tests/qquickwebview/qquickwebview.pro:
* UIProcess/API/qt/tests/qrawwebview/qrawwebview.pro:
* UIProcess/API/qt/tests/tests.pri:
* WebProcess.pro:
Tools:
* DumpRenderTree/qt/DumpRenderTree.pro:
* MiniBrowser/qt/MiniBrowser.pro:
* MiniBrowser/qt/raw/Target.pri:
* QtTestBrowser/QtTestBrowser.pro:
* Scripts/webkitpy/layout_tests/port/qt.py:
(QtPort._path_to_webcore_library):
* WebKitTestRunner/InjectedBundle/Target.pri:
* WebKitTestRunner/Target.pri:
* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/webkit_modules.prf:
* qmake/mkspecs/features/win32/default_post.prf:
git-svn-id: svn://svn.chromium.org/blink/trunk@131300 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/Tools/qmake')
3 files changed, 5 insertions, 5 deletions
diff --git a/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf b/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf index 87538e5..aa21b5d 100644 --- a/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf +++ b/third_party/WebKit/Tools/qmake/mkspecs/features/default_post.prf @@ -180,7 +180,7 @@ contains(TEMPLATE, lib) { # For anyone trying to include stdint.h win32-msvc*|win32-icc|wince*: INCLUDEPATH += $$ROOT_WEBKIT_DIR/Source/JavaScriptCore/os-win32 -contains(QT, webkit) { +contains(QT, webkitwidgets) { # In addition to the main shared QtWebKit library we also # need to link to any intermediate shared libraries. force_static_libs_as_shared { @@ -201,12 +201,12 @@ defineTest(needToLink) { contains(libraries, $$TARGET): return(true) # Or anything that uses QtWebKit in this special config - contains(QT, webkit): return(true) + contains(QT, webkitwidgets): return(true) } # Lastly, we allow apps (jsc) to link directly to the intermediate # libraries intead of using the exported symbols from QtWebKit. - contains(TEMPLATE, app):!contains(QT, webkit): return(true) + contains(TEMPLATE, app):!contains(QT, webkitwidgets): return(true) # Anything else should just get include paths, etc, not link return(false) diff --git a/third_party/WebKit/Tools/qmake/mkspecs/features/webkit_modules.prf b/third_party/WebKit/Tools/qmake/mkspecs/features/webkit_modules.prf index a5ab927..b2f3353 100644 --- a/third_party/WebKit/Tools/qmake/mkspecs/features/webkit_modules.prf +++ b/third_party/WebKit/Tools/qmake/mkspecs/features/webkit_modules.prf @@ -34,7 +34,7 @@ for(library, WEBKIT) { # Anything not linking dynamically to QtWebKit should make sure to have its export # macros synchronized with the code that it will be linked with statically. - !contains(QT, webkit): DEFINES += STATICALLY_LINKED_WITH_$$library + !contains(QT, webkitwidgets): DEFINES += STATICALLY_LINKED_WITH_$$library } !isEmpty(MODULE): CONFIG += creating_module diff --git a/third_party/WebKit/Tools/qmake/mkspecs/features/win32/default_post.prf b/third_party/WebKit/Tools/qmake/mkspecs/features/win32/default_post.prf index 061d69d..93861ef 100644 --- a/third_party/WebKit/Tools/qmake/mkspecs/features/win32/default_post.prf +++ b/third_party/WebKit/Tools/qmake/mkspecs/features/win32/default_post.prf @@ -40,4 +40,4 @@ shared:contains(TEMPLATE, lib) { } # To ensure the Qt export macros are set to dllexport -contains(TEMPLATE, lib):!contains(QT, webkit): DEFINES += QT_MAKEDLL +contains(TEMPLATE, lib):!contains(QT, webkitwidgets): DEFINES += QT_MAKEDLL |