Merge branch 'numpadwidgetqt5only' into 'master'

Only supporting numberpadwidget in Qt5 builds.

See merge request !45

radixwidgets/CMakeLists.txt

@@ -23,7 +23,11 @@ TRIBITS_SUBPACKAGE(widgets)
 SET(HEADERS
    tabwidget.hh
    tableview.hh
-   numberpadwidget.hh
+)
+# C/C++ source
+SET(SOURCES
+   tabwidget.cc
+   tableview.cc
 )
 #
 # Moc the header files
@@ -38,6 +42,12 @@ IF(USE_QT4)
    #   ${RESOURCE_FILES}
    #)
 ELSE()
+   SET(HEADERS
+       ${HEADERS}
+       numberpadwidget.hh)
+   SET(SOURCES
+       ${SOURCES}
+       numberpadwidget.cc)
    QT5_WRAP_CPP(MOC_FILES
       ${HEADERS}
    )
@@ -47,12 +57,6 @@ ELSE()
    #   ${RESOURCE_FILES}
    #)
 ENDIF()
-# C/C++ source
-SET(SOURCES
-   tabwidget.cc
-   tableview.cc
-   numberpadwidget.cc
-)
 
 ##---------------------------------------------------------------------------##
 ## PACKAGE TARGETS AND INSTALL

radixwidgets/examples/CMakeLists.txt

@@ -21,6 +21,10 @@ ELSE()
    QT5_WRAP_CPP(QMOC_FILES3
        radixnumberpadwidget.hh
    )
+   TRIBITS_ADD_EXECUTABLE(radixnumberpadwidget
+     NOEXEPREFIX
+     SOURCES radixnumberpadwidget.cc ${QMOC_FILES3}
+   )
 ENDIF()
 TRIBITS_ADD_EXECUTABLE(radixtabwidget
   NOEXEPREFIX
@@ -32,7 +36,3 @@ TRIBITS_ADD_EXECUTABLE(radixtablewidget
   SOURCES radixtablewidget.cc ${QMOC_FILES2}
 )
 
-TRIBITS_ADD_EXECUTABLE(radixnumberpadwidget
-  NOEXEPREFIX
-  SOURCES radixnumberpadwidget.cc ${QMOC_FILES3}
-)