From 81dbf09d988d87f82496ba106b5f1dd2aad7967d Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Fri, 5 Oct 2012 11:59:50 +0200 Subject: Port to Qt5. To compile and test, one needs to install the qt5-meta-minimal package from the Canonical Qt5 Edgers PPA (https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta1). This installs Qt5 in /opt/qt5/. cmake needs to be invoked with CMAKE_PREFIX_PATH=/opt/qt5/lib/cmake, and /opt/qt5/bin needs to be added to $PATH. --- libqmenumodel/src/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'libqmenumodel/src') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index 17d11f1..7e31941 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -19,7 +19,7 @@ set(QMENUMODEL_HEADERS qstateaction.h ) -qt4_wrap_cpp(QMENUMODEL_MOC +qt5_wrap_cpp(QMENUMODEL_MOC ${QMENUMODEL_HEADERS} ) @@ -39,8 +39,11 @@ include_directories( ${GIO_INCLUDE_DIRS} ) +qt5_use_modules(qmenumodel Core Widgets) + target_link_libraries(qmenumodel ${QT_QTCORE_LIBRARY} ${GLIB_LDFLAGS} ${GIO_LDFLAGS} ) + -- cgit v1.2.3 From 82677d03e4ec89ea4387467bcf7caa954a5ae183 Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Fri, 5 Oct 2012 15:13:34 +0200 Subject: Use the automoc feature to simplify a lot the build system. --- libqmenumodel/src/CMakeLists.txt | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'libqmenumodel/src') diff --git a/libqmenumodel/src/CMakeLists.txt b/libqmenumodel/src/CMakeLists.txt index 7e31941..373d11b 100644 --- a/libqmenumodel/src/CMakeLists.txt +++ b/libqmenumodel/src/CMakeLists.txt @@ -2,6 +2,7 @@ project(src) set(QMENUMODEL_SRC converter.cpp + dbus-enums.h qmenumodel.cpp qdbusobject.cpp qdbusmenumodel.cpp @@ -9,41 +10,15 @@ set(QMENUMODEL_SRC qstateaction.cpp ) -set(QMENUMODEL_HEADERS - converter.h - dbus-enums.h - qmenumodel.h - qdbusobject.h - qdbusmenumodel.h - qdbusactiongroup.h - qstateaction.h -) - -qt5_wrap_cpp(QMENUMODEL_MOC - ${QMENUMODEL_HEADERS} -) - add_library(qmenumodel STATIC ${QMENUMODEL_SRC} - ${QMENUMODEL_MOC} ) set_target_properties(qmenumodel PROPERTIES COMPILE_FLAGS -fPIC) include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${QT_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_QTGUI_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} - ${GIO_INCLUDE_DIRS} ) qt5_use_modules(qmenumodel Core Widgets) -target_link_libraries(qmenumodel - ${QT_QTCORE_LIBRARY} - ${GLIB_LDFLAGS} - ${GIO_LDFLAGS} -) - -- cgit v1.2.3 From 900b75e3528ea23b9158c52e43bca905a1ee5e5f Mon Sep 17 00:00:00 2001 From: Olivier Tilloy Date: Fri, 5 Oct 2012 15:23:11 +0200 Subject: Fixed some deprecation warnings when generating the API documentation. --- libqmenumodel/src/qdbusactiongroup.cpp | 6 +++--- libqmenumodel/src/qdbusmenumodel.cpp | 8 ++++---- libqmenumodel/src/qdbusobject.cpp | 14 +++++++------- libqmenumodel/src/qmenumodel.cpp | 4 ++-- libqmenumodel/src/qstateaction.cpp | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) (limited to 'libqmenumodel/src') diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp index 5a9e0bd..fc5b18e 100644 --- a/libqmenumodel/src/qdbusactiongroup.cpp +++ b/libqmenumodel/src/qdbusactiongroup.cpp @@ -26,12 +26,12 @@ extern "C" { } /*! - \qmlclass QDBusActionGroup + \qmltype QDBusActionGroup \inherits QDBusObject \brief A DBusActionGroup implementation to be used with \l QDBusMenuModel - \bold {This component is under heavy development.} + \b {This component is under heavy development.} This class can be used as a proxy for an action group that is exported over D-Bus @@ -67,7 +67,7 @@ QDBusActionGroup::~QDBusActionGroup() Look for a action with the same name and return a \l QStateAction object. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ QStateAction *QDBusActionGroup::action(const QString &name) { diff --git a/libqmenumodel/src/qdbusmenumodel.cpp b/libqmenumodel/src/qdbusmenumodel.cpp index 88a6084..ae88c35 100644 --- a/libqmenumodel/src/qdbusmenumodel.cpp +++ b/libqmenumodel/src/qdbusmenumodel.cpp @@ -20,12 +20,12 @@ #include "qdbusmenumodel.h" /*! - \qmlclass QDBusMenuModel + \qmltype QDBusMenuModel \inherits QDBusObject \brief The QDBusMenuModel class defines the list model for DBus menus - \bold {This component is under heavy development.} + \b {This component is under heavy development.} This class expose the menu previous exported over DBus. @@ -63,7 +63,7 @@ QDBusMenuModel::~QDBusMenuModel() The status will change to connecting after call this function, and as soon the busName apperas and the objectPat was found this will change to Connected. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDBusMenuModel::start() { @@ -75,7 +75,7 @@ void QDBusMenuModel::start() Stops dbus watch and clear the model, the status wil change to Disconnected. - \bold Note: methods should only be called after the Component has completed. + \b Note: methods should only be called after the Component has completed. */ void QDBusMenuModel::stop() { diff --git a/libqmenumodel/src/qdbusobject.cpp b/libqmenumodel/src/qdbusobject.cpp index abc68b4..63be580 100644 --- a/libqmenumodel/src/qdbusobject.cpp +++ b/libqmenumodel/src/qdbusobject.cpp @@ -22,10 +22,10 @@ #include /*! - \qmlclass QDBusObject + \qmltype QDBusObject \brief The QDBusObject is a base class - \bold {This component is under heavy development.} + \b {This component is under heavy development.} This is a abstracted class used by QDBusMenuModel and QDBusActionGroup */ @@ -37,8 +37,8 @@ This must be seteed before call start method The valid values are: \list - \o 1 - SessionBus - \o 2 - SystemBus + \li 1 - SessionBus + \li 2 - SystemBus \endlist */ @@ -62,9 +62,9 @@ Te velid status are: \list - \o 0 - Disconnected - \o 1 - Connecting - \o 2 - Connected + \li 0 - Disconnected + \li 1 - Connecting + \li 2 - Connected \endlist */ diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp index e88bc66..4c0fc23 100644 --- a/libqmenumodel/src/qmenumodel.cpp +++ b/libqmenumodel/src/qmenumodel.cpp @@ -23,10 +23,10 @@ #include /*! - \qmlclass QMenuModel + \qmltype QMenuModel \brief The QMenuModel class implements the base list model for menus - \bold {This component is under heavy development.} + \b {This component is under heavy development.} This is a abstracted class used by \l QDBusMenuModel. */ diff --git a/libqmenumodel/src/qstateaction.cpp b/libqmenumodel/src/qstateaction.cpp index 3629fce..5dda39f 100644 --- a/libqmenumodel/src/qstateaction.cpp +++ b/libqmenumodel/src/qstateaction.cpp @@ -22,12 +22,12 @@ #include "qdbusactiongroup.h" /*! - \qmlclass QStateAction + \qmltype QStateAction \inherits QAction \brief A QStateAction implementation to be used with \l QDBusActionGroup - \bold {This component is under heavy development.} + \b {This component is under heavy development.} This class can be used as a proxy for an action that is exported over D-Bus -- cgit v1.2.3