diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2013-01-18 09:10:29 -0300 |
|---|---|---|
| committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2013-01-18 09:10:29 -0300 |
| commit | 5234489c353f103e83644081e12ec06728bd9cc1 (patch) | |
| tree | ac4e1fa9693e9da25fd38ec4914071013073d767 /libqmenumodel | |
| parent | 954e6e636d5d8f903f7b6874d0e21a30c274d530 (diff) | |
| download | qmenumodel-5234489c353f103e83644081e12ec06728bd9cc1.tar.gz qmenumodel-5234489c353f103e83644081e12ec06728bd9cc1.tar.bz2 qmenumodel-5234489c353f103e83644081e12ec06728bd9cc1.zip | |
Updated to qt5 final.
Diffstat (limited to 'libqmenumodel')
| -rw-r--r-- | libqmenumodel/QMenuModel/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | libqmenumodel/src/qmenumodel.pc.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libqmenumodel/QMenuModel/CMakeLists.txt b/libqmenumodel/QMenuModel/CMakeLists.txt index 8a7702f..047938f 100644 --- a/libqmenumodel/QMenuModel/CMakeLists.txt +++ b/libqmenumodel/QMenuModel/CMakeLists.txt @@ -26,7 +26,7 @@ execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_CURRENT_S # Apparently, QT_IMPORTS_DIR didn’t make it to Qt5. # In want of a better solution, let’s hardcode it… -set(QT_IMPORTS_DIR /opt/qt5/imports) +set(QT_IMPORTS_DIR ${_qt5Qml_install_prefix}/${CMAKE_INSTALL_LIBDIR}/qt5/qml) set(QMLPLUGIN_INSTALL_PREFIX "${QT_IMPORTS_DIR}/QMenuModel") install(TARGETS qmenumodel-qml DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) install(FILES qmldir DESTINATION ${QMLPLUGIN_INSTALL_PREFIX}) diff --git a/libqmenumodel/src/qmenumodel.pc.in b/libqmenumodel/src/qmenumodel.pc.in index 1c410bc..56f149a 100644 --- a/libqmenumodel/src/qmenumodel.pc.in +++ b/libqmenumodel/src/qmenumodel.pc.in @@ -7,7 +7,7 @@ Name: qmenumodel Description: Qt binding for GMenuModel. Version: 0.1 -Requires.private: QtCore QtWidgets gio-2.0 +Requires.private: Qt5Core Qt5Widgets gio-2.0 Libs: -L${libdir} -l@SHAREDLIBNAME@ Cflags: -I${includedir}/@INCLUDEDIR@ |