Changeset 136116 in webkit

Timestamp:

Nov 29, 2012, 2:56:42 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Fix installation of QtWebProcess binary
​https://bugs.webkit.org/show_bug.cgi?id=101735

Patch by Andras Becsi <​andras.becsi@digia.com> on 2012-11-29
Reviewed by Simon Hausmann.

Source/WebKit2:

If available use QLibraryInfo::LibraryExecutablesPath to find
the web process and the plugin process and deploy both helper
processes to QT_INSTALL_LIBEXECS.

The effective fallback used to find the helper processes becomes:

1. Application directory
2. Qt library executables directory (QLibraryInfo::LibraryExecutablesPath)
3. Qt binaries directory (QLibraryInfo::BinariesPath)
4. No absolute path used

• PluginProcess.pro:
• Shared/qt/ProcessExecutablePathQt.cpp:

(WebKit::executablePath):

• WebProcess.pro:

Tools:

Add config test to detect the availability of support
for "program executables" in Qt (libexec).

This test can be removed after the Qt5 release.

• Tools.pro:
• qmake/mkspecs/features/features.prf:
• qmake/config.tests/libexecdir/libexecdir.cpp:
• qmake/config.tests/libexecdir/libexecdir.pro:

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/PluginProcess.pro (modified) (1 diff)
• Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess.pro (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Tools.pro (modified) (1 diff)
• Tools/qmake/config.tests/libexecdir (added)
• Tools/qmake/config.tests/libexecdir/libexecdir.cpp (added)
• Tools/qmake/config.tests/libexecdir/libexecdir.pro (added)
• Tools/qmake/mkspecs/features/features.prf (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-29  Andras Becsi  <andras.becsi@digia.com>
+
+        [Qt] Fix installation of QtWebProcess binary
+        https://bugs.webkit.org/show_bug.cgi?id=101735
+
+        Reviewed by Simon Hausmann.
+
+        If available use QLibraryInfo::LibraryExecutablesPath to find
+        the web process and the plugin process and deploy both helper
+        processes to QT_INSTALL_LIBEXECS.
+
+        The effective fallback used to find the helper processes becomes:
+            1. Application directory
+            2. Qt library executables directory (QLibraryInfo::LibraryExecutablesPath)
+            3. Qt binaries directory (QLibraryInfo::BinariesPath)
+            4. No absolute path used
+
+        * PluginProcess.pro:
+        * Shared/qt/ProcessExecutablePathQt.cpp:
+        (WebKit::executablePath):
+        * WebProcess.pro:
+
 2012-11-28  Ryuan Choi  <ryuan.choi@gmail.com>
 

trunk/Source/WebKit2/PluginProcess.pro

@@ -22 +22 @@
 
 isEmpty(INSTALL_BINS) {
-    target.path = $$[QT_INSTALL_BINS]
+    use?(libexecdir): target.path = $$[QT_INSTALL_LIBEXECS]
+    else: target.path = $$[QT_INSTALL_BINS]
 } else {
     target.path = $$INSTALL_BINS

trunk/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp

@@ -41 +41 @@
         return String(expectedPath);
 
-    expectedPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator() + baseName;
+    QLibraryInfo::LibraryLocation location = QLibraryInfo::BinariesPath;
+#if USE(LIBEXECDIR)
+    location = QLibraryInfo::LibraryExecutablesPath;
+#endif
+
+    expectedPath = QLibraryInfo::location(location) + QDir::separator() + baseName;
     if (QFile::exists(expectedPath))
         return String(expectedPath);

trunk/Source/WebKit2/WebProcess.pro

@@ -22 +22 @@
 
 isEmpty(INSTALL_BINS) {
-    target.path = $$[QT_INSTALL_BINS]
+    use?(libexecdir): target.path = $$[QT_INSTALL_LIBEXECS]
+    else: target.path = $$[QT_INSTALL_BINS]
 } else {
     target.path = $$INSTALL_BINS

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-29  Andras Becsi  <andras.becsi@digia.com>
+
+        [Qt] Fix installation of QtWebProcess binary
+        https://bugs.webkit.org/show_bug.cgi?id=101735
+
+        Reviewed by Simon Hausmann.
+
+        Add config test to detect the availability of support
+        for "program executables" in Qt (libexec).
+
+        This test can be removed after the Qt5 release.
+
+        * Tools.pro:
+        * qmake/mkspecs/features/features.prf:
+        * qmake/config.tests/libexecdir/libexecdir.cpp:
+        * qmake/config.tests/libexecdir/libexecdir.pro:
+
 2012-11-29  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Tools.pro

@@ -35 +35 @@
     qmake/config.tests/fontconfig/* \
     qmake/config.tests/gccdepends/* \
+    qmake/config.tests/libexecdir/* \
     qmake/mkspecs/modules/* \
     qmake/mkspecs/features/*.prf \

trunk/Tools/qmake/mkspecs/features/features.prf

@@ -38 +38 @@
     haveQtModule(testlib): WEBKIT_CONFIG += have_qttestlib
 
+    config_libexecdir: WEBKIT_CONFIG += use_libexecdir
     config_libxml2: WEBKIT_CONFIG += use_libxml2
     config_libxslt: WEBKIT_CONFIG += xslt