diff options
| author | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2014-02-03 12:16:29 +0100 |
|---|---|---|
| committer | George Kiagiadakis <george.kiagiadakis@collabora.com> | 2014-02-03 12:16:29 +0100 |
| commit | 8f46cc8fe5b675cf42d4d9aa20a0d731b5334a57 (patch) | |
| tree | 25da12ef65d6d505883ebc0106be867f8bd62bbc | |
| parent | 93a489d29422cf15781239931919aa6d13b5c7c9 (diff) | |
Revert "cmake: Fix install path for QtQuick2 library"
This reverts commit 93a489d29422cf15781239931919aa6d13b5c7c9,
which is wrong because QtQuick1 stuff are also installed when
built against Qt5 and therefore the QTQUICK1_INSTALL_DIR must
exist and it should be the imports dir. QTQUICK2_INSTALL_DIR
is a different thing.
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a23bd70..4e64104 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,14 +162,10 @@ else() endif() if (USE_QT_PLUGIN_DIR) - if (USE_QT5) - set(QTGSTREAMER_QTQUICK2_INSTALL_DIR ${QT_IMPORTS_DIR}) - else() - set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${QT_IMPORTS_DIR}) - endif() + set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${QT_IMPORTS_DIR}) else() if (USE_QT5) - set(QTGSTREAMER_QTQUICK2_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/qml) + set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/imports) else() set(QTGSTREAMER_QTQUICK1_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt4/imports) endif() |