Merge lp:~fboucault/webbrowser-app/cmake_no_depend_on_qmake into lp:webbrowser-app/staging

[Florian Boucault]

Do not rely on qmake as webbrowser is CMake based.

Do not rely on qmake as webbrowser is CMake based.

[Olivier Tilloy (osomon)]

Please remove qt5-qmake from the build deps in debian/control and from the build-packages in snap/snapcraft.yaml.

review: Needs Fixing

[lp:~fboucault/webbrowser-app/cmake_no_depend_on_qmake]

1625. By Florian Boucault on 2017-03-03

Removed qmake from the build dependencies for both debian and snap

1626. By Florian Boucault on 2017-03-03

Unified setting QT_INSTALL_QML in case of native and cross compilation

[Olivier Tilloy (osomon)]

When building locally (natively, not cross-compiling), i.e. running:
   cmake .
   make install DESTDIR=/tmp/bleh

I’m seeing the public QML modules being installed in $DESTDIR/usr/local/lib/qt5/qml/, whereas without your changes they are installed in $DESTDIR/usr/lib/x86_64-linux-gnu/qt5/qml/.

This doesn’t look right, QML is not going to search for modules in /usr/local/lib/qt5/qml by default.

review: Needs Fixing

[Florian Boucault (fboucault)]

set(QT_INSTALL_QML "${CMAKE_INSTALL_LIBDIR}/qt5/qml") given the default value of CMAKE_INSTALL_LIBDIR ('lib') and the default value of CMAKE_INSTALL_PREFIX ('/usr/local') will indeed result in what you said.

"make DESTDIR=/home/john install

will install the concerned software using the installation prefix, e.g. “/usr/local” prepended with the DESTDIR value which finally gives “/home/john/usr/local”." [1]

However, be it $DESTDIR/usr/lib/x86_64-linux-gnu/qt5/qml/ like before or $DESTDIR/usr/local/lib/qt5/qml/ like with that patch, QML will not be looking in _either_ of these directories anyway.

[1] https://cmake.org/cmake/help/v3.0/variable/CMAKE_INSTALL_PREFIX.html

> When building locally (natively, not cross-compiling), i.e. running:
> cmake .
> make install DESTDIR=/tmp/bleh
>
> I’m seeing the public QML modules being installed in
> $DESTDIR/usr/local/lib/qt5/qml/, whereas without your changes they are
> installed in $DESTDIR/usr/lib/x86_64-linux-gnu/qt5/qml/.
>
> This doesn’t look right, QML is not going to search for modules in
> /usr/local/lib/qt5/qml by default.

[Olivier Tilloy (osomon)]

Right, but my point was not about DESTDIR, really. My point was that with an empty DESTDIR (the default), running `make install` locally will install the QML modules in a place where the QML engine will be able to locate them. With your change, it won’t work any longer.

[lp:~fboucault/webbrowser-app/cmake_no_depend_on_qmake]

1627. By Florian Boucault on 2017-03-07

More robust QT_INSTALL_QML: 'make install' will install in a directory that QML will be looking for imports in

[Olivier Tilloy (osomon)]

LGTM, thanks!

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-02-13 12:49:07 +0000
+++ debian/control	2017-03-07 12:34:48 +0000
@@ -23,7 +23,6 @@
                qml-module-qtsysteminfo,
                qml-module-qttest,
                qt5-default,
-               qt5-qmake,
                qtbase5-dev (>= 5.4),
                qtbase5-dev-tools,
                qtbase5-private-dev,

=== modified file 'snap/snapcraft.yaml'
--- snap/snapcraft.yaml	2017-03-02 21:29:04 +0000
+++ snap/snapcraft.yaml	2017-03-07 12:34:48 +0000
@@ -41,7 +41,6 @@
       - lsb-release
       - pkg-config
       - qt5-default
-      - qt5-qmake
       - qtbase5-dev
       - qtbase5-dev-tools
       - qtbase5-private-dev

=== modified file 'src/Ubuntu/CMakeLists.txt'
--- src/Ubuntu/CMakeLists.txt	2016-08-24 18:17:55 +0000
+++ src/Ubuntu/CMakeLists.txt	2017-03-07 12:34:48 +0000
@@ -1,23 +1,4 @@
-if(NOT CMAKE_CROSSCOMPILING)
-    find_program(QMAKE_EXECUTABLE qmake)
-    if(QMAKE_EXECUTABLE STREQUAL "QMAKE_EXECUTABLE-NOTFOUND")
-        message(FATAL_ERROR "qmake not found")
-    endif()
-    execute_process(
-        COMMAND ${QMAKE_EXECUTABLE} -query QT_INSTALL_QML
-        RESULT_VARIABLE RESULT
-        OUTPUT_VARIABLE QT_INSTALL_QML
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(NOT RESULT EQUAL 0)
-        message(FATAL_ERROR "Failed to determine QT_INSTALL_QML from qmake")
-    endif()
-else()
-    # qmake isn't multi-arch aware as it installs arch-specific mkspec files
-    # in to /usr/share, so we can't use it here (we'd need a qmake binary
-    # for the host arch using data for the target arch)
-    set(QT_INSTALL_QML "/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml")
-endif()
+set(QT_INSTALL_QML "/usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}/qt5/qml")
 
 execute_process(COMMAND lsb_release --short --release
     OUTPUT_VARIABLE UBUNTU_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)