Adds various fixes, improvements and finally the qt4 qt5 common build

CMakeLists.txt

@@ -1,6 +1,8 @@
 # CMakeLists.txt has to be located in the project folder and cmake has to be
 # executed from 'project/build' with 'cmake ../'.
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 3.5)
+project(MyWidget VERSION 0.1 DESCRIPTION "Widget tutorial")
 find_package(Rock)
-rock_init(MyWidget 0.1)
+rock_init()
+rock_feature(NOCURDIR)
 rock_standard_layout()

manifest.xml

@@ -8,7 +8,8 @@
   <logo>http://</logo>
 
   <depend package="base/types" />
-  <depend package="qt4" />
-  <depend package="qt-designer" />
-  <depend package="qt4-opengl" />
+  <depend package="qt4" optional="1" />
+  <depend package="qt-designer" optional="1" />
+  <depend package="qt5" optional="1" />
+  <depend package="qt5-designer" optional="1" />
 </package>

src/CMakeLists.txt

@@ -1,34 +1,63 @@
-find_package(Qt4 REQUIRED QtCore QtGui QtOpengl QtDesigner)
-include_directories(${QT_INCLUDE_DIR})
-include_directories(${QT_QTCORE_INCLUDE_DIR})
-include_directories(${QT_QTGUI_INCLUDE_DIR})
+rock_find_qt4(OPTIONAL QtCore QtGui QtDesigner)
+rock_find_qt5(OPTIONAL Core Gui Widgets UiPlugin)
+
+include(RockQt)
+
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 SET(MOC_HDRS
     MyWidget.h
     MyWidgetPlugin.h
 )
 
-SET(HDRS
+SET(INSTALLED_HDRS
     MyWidget.h
 )
 
-FILE(GLOB SRCS
-    *.cc
-)
+SET(SRCS
+    MyWidget.cc
+    MyWidgetPlugin.cc
+    )
+# Alternatively, FILE(GLOB) can find any matching file in the directory.
+# For this reason, the mywidgetTest executable uses main.cpp instead of main.cc.
+#FILE(GLOB SRCS
+#    *.cc
+#)
 
 SET(QtApp_RCCS resources.qrc)
-QT4_ADD_RESOURCES(QtApp_RCC_SRCS ${QtApp_RCCS})
+if(ROCK_QT4)
+    QT4_ADD_RESOURCES(QtApp_RCC_SRCS_QT4 ${QtApp_RCCS})
+endif()
+if(ROCK_QT5)
+    QT5_ADD_RESOURCES(QtApp_RCC_SRCS_QT5 ${QtApp_RCCS})
+endif()
 
-rock_vizkit_widget(MyWidget
-    SOURCES ${SRCS} ${QtApp_RCC_SRCS} 
-    HEADERS ${HDRS}
+rock_qt_vizkit_widget(
+    TARGETPREFIX MyWidget
+    QT4_SUFFIX ""
+    SOURCES ${SRCS}
+    SOURCES_QT4 ${QtApp_RCC_SRCS_QT4}
+    SOURCES_QT5 ${QtApp_RCC_SRCS_QT5}
+    HEADERS ${INSTALLED_HDRS}
     MOC ${MOC_HDRS}
-    DEPS_PKGCONFIG base-types base-lib QtCore QtGui
-    DEPS_CMAKE
-    LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTDESIGNER_LIBRARY}
+    DEPS_PKGCONFIG base-types base-lib
+# Using the cmake targets for target_link_libraries but the
+# pkgconfig packages in the .pc file.
+# equivalent pkgconfig based configuration:
+#   DEPS_PKGCONFIG_QT4 QtCore QtGui
+#   DEPS_PKGCONFIG_QT5 Qt5Core Qt5Gui Qt5Widgets
+# above will also add the dependencies to the .pc file, so they
+# are not needed in the .pc.in.
+    LIBS_QT4 Qt4::QtCore Qt4::QtGui
+    LIBS_QT5 Qt5::Core Qt5::Gui Qt5::Widgets
+# for include directories. These do not need to be added to the .pc files,
+# the INSTALLED_HDRS do not use them.
+    LIBS_QT4 Qt4::QtDesigner
+    LIBS_QT5 Qt5::UiPlugin
 )
 
-rock_executable(mywidgetTest
-                main.cpp
-                DEPS MyWidget)
+rock_qt_executable(
+    TARGETPREFIX mywidgetTest
+    QT4_SUFFIX ""
+    SOURCES main.cpp
+    DEPS_QT MyWidget)

src/MyWidget-qt5.pc.in

@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/lib
+includedir=${prefix}/include
+
+Name: @TARGET_NAME@
+Description: @PROJECT_DESCRIPTION@
+Version: @PROJECT_VERSION@
+Requires: @DEPS_PKGCONFIG@ Qt5Core Qt5Gui Qt5Widgets
+Libs: -L${libdir} -l@TARGET_NAME@
+Cflags: -I${includedir}
+

src/MyWidget.cc

@@ -1,4 +1,7 @@
 #include "MyWidget.h"
+#include <QGroupBox>
+#include <QFormLayout>
+#include <QLabel>
 
 MyWidget::MyWidget(QWidget *parent)
     : QWidget(parent)

src/MyWidget.h

@@ -1,19 +1,26 @@
-#ifndef MYWIDGET_H
-#define MYWIDGET_H
+#pragma once
 
-#include <QtGui>
+#include <QWidget>
 
 #include <base/samples/RigidBodyState.hpp>
 
+QT_BEGIN_NAMESPACE
+
+class QGroupBox;
+class QFormLayout;
+class QLabel;
+
+QT_END_NAMESPACE
+
 class MyWidget : public QWidget
 {
     Q_OBJECT
 public:
     MyWidget(QWidget *parent = 0);
     virtual ~MyWidget();
+    base::samples::RigidBodyState getPose();
 
 public slots:
-    base::samples::RigidBodyState getPose();
     void setPose(const base::samples::RigidBodyState pose);
 
 private:
@@ -31,5 +38,3 @@ public slots:
     QLabel* l3;
 
 };
-
-#endif /* MYWIDGET_H */

src/MyWidget.pc.in

@@ -6,7 +6,7 @@ includedir=${prefix}/include
 Name: @TARGET_NAME@
 Description: @PROJECT_DESCRIPTION@
 Version: @PROJECT_VERSION@
-Requires: @DEPS_PKGCONFIG@
+Requires: @DEPS_PKGCONFIG@ QtCore QtGui
 Libs: -L${libdir} -l@TARGET_NAME@
 Cflags: -I${includedir}
 

src/MyWidgetPlugin.cc

@@ -1,7 +1,9 @@
 #include "MyWidgetPlugin.h"
 #include "MyWidget.h"
 
+#if QT_VERSION < 0x050000
 Q_EXPORT_PLUGIN2(MyWidget, MyWidgetPlugin)
+#endif
 
 MyWidgetPlugin::MyWidgetPlugin(QObject *parent)
     : QObject(parent)

src/MyWidgetPlugin.h

@@ -1,12 +1,15 @@
-#ifndef MYWIDGETPLUGIN_H
-#define MYWIDGETPLUGIN_H
+#pragma once
 
-#include <QtGui>
-#include <QtDesigner/QDesignerCustomWidgetInterface>
+#include <QObject>
+#include <QtPlugin>  // for Q_PLUGIN_METADATA and Q_EXPORT_PLUGIN2
+#include <QDesignerCustomWidgetInterface>
 
 class MyWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 {
     Q_OBJECT
+#if QT_VERSION >= 0x050000
+    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
+#endif
     Q_INTERFACES(QDesignerCustomWidgetInterface)
 
 public:
@@ -28,5 +31,3 @@ class MyWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface
 private:
     bool initialized; 
 };
-
-#endif /* MYWIDGETPLUGIN_H */  

src/main.cpp

@@ -1,4 +1,4 @@
-#include <QtGui/QApplication>
+#include <QApplication>
 
 #include "MyWidget.h"