Commit a6c40198 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen Committed by The Qt Project
Browse files

adjust to new "configure -nomake tools" semantics


Change-Id: I953ce0215e67ee4dd8fa4fc0db2c1903946e3132
Reviewed-by: default avatarJoerg Bornemann <joerg.bornemann@digia.com>
parent 489c8f3f
Branches
Tags
No related merge requests found
Showing with 32 additions and 1 deletion
...@@ -11,3 +11,11 @@ SUBDIRS = calculatorform ...@@ -11,3 +11,11 @@ SUBDIRS = calculatorform
# the sun cc compiler has a problem with the include lines for the form.prf # the sun cc compiler has a problem with the include lines for the form.prf
solaris-cc*:SUBDIRS -= calculatorbuilder \ solaris-cc*:SUBDIRS -= calculatorbuilder \
worldtimeclockbuilder worldtimeclockbuilder
qtNomakeTools( \
containerextension \
customwidgetplugin \
taskmenuextension \
worldtimeclockbuilder \
worldtimeclockplugin \
)
# FIXME: the src directory contains both libs and tools parts
load(qt_parts) load(qt_parts)
...@@ -12,3 +12,10 @@ assistant.depends = help ...@@ -12,3 +12,10 @@ assistant.depends = help
qhelpgenerator.depends = help qhelpgenerator.depends = help
qcollectiongenerator.depends = help qcollectiongenerator.depends = help
qhelpconverter.depends = help qhelpconverter.depends = help
qtNomakeTools( \
assistant \
qhelpgenerator \
qcollectiongenerator \
qhelpconverter \
)
...@@ -11,3 +11,10 @@ contains(QT_CONFIG, shared): SUBDIRS += plugins ...@@ -11,3 +11,10 @@ contains(QT_CONFIG, shared): SUBDIRS += plugins
components.depends = lib components.depends = lib
designer.depends = components designer.depends = components
plugins.depends = lib plugins.depends = lib
qtNomakeTools( \
lib \
components \
designer \
plugins \
)
...@@ -5,6 +5,10 @@ SUBDIRS = \ ...@@ -5,6 +5,10 @@ SUBDIRS = \
lconvert lconvert
!no-png:qtHaveModule(widgets): SUBDIRS += linguist !no-png:qtHaveModule(widgets): SUBDIRS += linguist
qtNomakeTools( \
linguist \
)
win32:CMAKE_BIN_SUFFIX = ".exe" win32:CMAKE_BIN_SUFFIX = ".exe"
CMAKE_QT_INSTALL_PREFIX_ESCAPED = "^$$re_escape($$[QT_INSTALL_PREFIX])/" CMAKE_QT_INSTALL_PREFIX_ESCAPED = "^$$re_escape($$[QT_INSTALL_PREFIX])/"
......
...@@ -21,3 +21,9 @@ mac { ...@@ -21,3 +21,9 @@ mac {
} }
qtHaveModule(dbus): SUBDIRS += qdbus qtHaveModule(dbus): SUBDIRS += qdbus
qtNomakeTools( \
pixeltool \
qtconfig \
macdeployqt \
)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment