diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-12-10 14:40:58 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-12-10 15:57:25 +0100 |
| commit | e4fafc8e2084954c7ca3e2f9749e8c496683c6fd (patch) | |
| tree | 086f4eb6ceb4ae42b93075f8a8ea77fc09ebc5be /Source | |
| parent | 3d6e868bbd7414e2ccd96517938d4326d55a12fa (diff) | |
| download | qtwebkit-e4fafc8e2084954c7ca3e2f9749e8c496683c6fd.tar.gz | |
Use QLibraryInfo::LibraryExecutablesPath unconditionally https://bugs.webkit.org/show_bug.cgi?id=104541
Reviewed by Jocelyn Turcotte.
We now depend on a Qt 5 version that is guaranteed to have this API, so we
can remove the configure checks for it.
Source/WebKit2:
* PluginProcess.pro:
* Shared/qt/ProcessExecutablePathQt.cpp:
(WebKit::executablePath):
* WebProcess.pro:
Tools:
* qmake/config.tests/libexecdir/libexecdir.cpp: Removed.
* qmake/config.tests/libexecdir/libexecdir.pro: Removed.
* qmake/mkspecs/features/features.prf:
Change-Id: I58114d887072c1b08f2b3216f85d92a668bfe44b
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137145 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/WebKit2/ChangeLog | 15 | ||||
| -rw-r--r-- | Source/WebKit2/PluginProcess.pro | 3 | ||||
| -rw-r--r-- | Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp | 7 | ||||
| -rw-r--r-- | Source/WebKit2/WebProcess.pro | 3 |
4 files changed, 18 insertions, 10 deletions
diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index fccab794a..e98636f2b 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,5 +1,20 @@ 2012-12-10 Simon Hausmann <simon.hausmann@digia.com> + [Qt] Use QLibraryInfo::LibraryExecutablesPath unconditionally + https://bugs.webkit.org/show_bug.cgi?id=104541 + + Reviewed by Jocelyn Turcotte. + + We now depend on a Qt 5 version that is guaranteed to have this API, so we + can remove the configure checks for it. + + * PluginProcess.pro: + * Shared/qt/ProcessExecutablePathQt.cpp: + (WebKit::executablePath): + * WebProcess.pro: + +2012-12-10 Simon Hausmann <simon.hausmann@digia.com> + [Qt] Fix build without QtQuick 2 Unreviewed trivial build fix. diff --git a/Source/WebKit2/PluginProcess.pro b/Source/WebKit2/PluginProcess.pro index b37895f32..52e785f04 100644 --- a/Source/WebKit2/PluginProcess.pro +++ b/Source/WebKit2/PluginProcess.pro @@ -21,8 +21,7 @@ INCLUDEPATH = \ INSTALLS += target isEmpty(INSTALL_BINS) { - use?(libexecdir): target.path = $$[QT_INSTALL_LIBEXECS] - else: target.path = $$[QT_INSTALL_BINS] + target.path = $$[QT_INSTALL_LIBEXECS] } else { target.path = $$INSTALL_BINS } diff --git a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp index 250b16c80..2a95a843e 100644 --- a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp +++ b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp @@ -40,12 +40,7 @@ static String executablePath(QString baseName) if (QFile::exists(expectedPath)) return String(expectedPath); - QLibraryInfo::LibraryLocation location = QLibraryInfo::BinariesPath; -#if USE(LIBEXECDIR) - location = QLibraryInfo::LibraryExecutablesPath; -#endif - - expectedPath = QLibraryInfo::location(location) + QDir::separator() + baseName; + expectedPath = QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) + QDir::separator() + baseName; if (QFile::exists(expectedPath)) return String(expectedPath); diff --git a/Source/WebKit2/WebProcess.pro b/Source/WebKit2/WebProcess.pro index db3f71a27..a64f5d281 100644 --- a/Source/WebKit2/WebProcess.pro +++ b/Source/WebKit2/WebProcess.pro @@ -21,8 +21,7 @@ build?(webkit1): DEFINES += HAVE_WEBKIT1 INSTALLS += target isEmpty(INSTALL_BINS) { - use?(libexecdir): target.path = $$[QT_INSTALL_LIBEXECS] - else: target.path = $$[QT_INSTALL_BINS] + target.path = $$[QT_INSTALL_LIBEXECS] } else { target.path = $$INSTALL_BINS } |