Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
LEFEBVREJP email
radix
Commits
4b978de6
Commit
4b978de6
authored
Jul 19, 2018
by
LEFEBVREJP email
Browse files
Only supporting numberpadwidget in Qt5 builds.
parent
0df3809a
Pipeline
#14176
passed with stages
in 7 minutes and 35 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
radixwidgets/CMakeLists.txt
View file @
4b978de6
...
@@ -23,7 +23,11 @@ TRIBITS_SUBPACKAGE(widgets)
...
@@ -23,7 +23,11 @@ TRIBITS_SUBPACKAGE(widgets)
SET
(
HEADERS
SET
(
HEADERS
tabwidget.hh
tabwidget.hh
tableview.hh
tableview.hh
numberpadwidget.hh
)
# C/C++ source
SET
(
SOURCES
tabwidget.cc
tableview.cc
)
)
#
#
# Moc the header files
# Moc the header files
...
@@ -38,6 +42,12 @@ IF(USE_QT4)
...
@@ -38,6 +42,12 @@ IF(USE_QT4)
# ${RESOURCE_FILES}
# ${RESOURCE_FILES}
#)
#)
ELSE
()
ELSE
()
SET
(
HEADERS
${
HEADERS
}
numberpadwidget.hh
)
SET
(
SOURCES
${
SOURCES
}
numberpadwidget.cc
)
QT5_WRAP_CPP
(
MOC_FILES
QT5_WRAP_CPP
(
MOC_FILES
${
HEADERS
}
${
HEADERS
}
)
)
...
@@ -47,12 +57,6 @@ ELSE()
...
@@ -47,12 +57,6 @@ ELSE()
# ${RESOURCE_FILES}
# ${RESOURCE_FILES}
#)
#)
ENDIF
()
ENDIF
()
# C/C++ source
SET
(
SOURCES
tabwidget.cc
tableview.cc
numberpadwidget.cc
)
##---------------------------------------------------------------------------##
##---------------------------------------------------------------------------##
## PACKAGE TARGETS AND INSTALL
## PACKAGE TARGETS AND INSTALL
...
...
radixwidgets/examples/CMakeLists.txt
View file @
4b978de6
...
@@ -21,6 +21,10 @@ ELSE()
...
@@ -21,6 +21,10 @@ ELSE()
QT5_WRAP_CPP
(
QMOC_FILES3
QT5_WRAP_CPP
(
QMOC_FILES3
radixnumberpadwidget.hh
radixnumberpadwidget.hh
)
)
TRIBITS_ADD_EXECUTABLE
(
radixnumberpadwidget
NOEXEPREFIX
SOURCES radixnumberpadwidget.cc
${
QMOC_FILES3
}
)
ENDIF
()
ENDIF
()
TRIBITS_ADD_EXECUTABLE
(
radixtabwidget
TRIBITS_ADD_EXECUTABLE
(
radixtabwidget
NOEXEPREFIX
NOEXEPREFIX
...
@@ -32,7 +36,3 @@ TRIBITS_ADD_EXECUTABLE(radixtablewidget
...
@@ -32,7 +36,3 @@ TRIBITS_ADD_EXECUTABLE(radixtablewidget
SOURCES radixtablewidget.cc
${
QMOC_FILES2
}
SOURCES radixtablewidget.cc
${
QMOC_FILES2
}
)
)
TRIBITS_ADD_EXECUTABLE
(
radixnumberpadwidget
NOEXEPREFIX
SOURCES radixnumberpadwidget.cc
${
QMOC_FILES3
}
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment