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
d7cf44b8
Commit
d7cf44b8
authored
Jul 19, 2018
by
LEFEBVREJP email
Browse files
Merge branch 'numpadwidgetqt5only' into 'master'
Only supporting numberpadwidget in Qt5 builds. See merge request
!45
parents
0df3809a
4b978de6
Pipeline
#14178
passed with stages
in 7 minutes and 38 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
radixwidgets/CMakeLists.txt
View file @
d7cf44b8
...
...
@@ -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
View file @
d7cf44b8
...
...
@@ -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
}
)
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