Changeset 2806 for trunk/kBuild

Timestamp:

Jan 28, 2016, 12:29:19 PM (9 years ago)

Author:

bird

Message:

units/qt5.kmk: /4/ -> /5/

File:

• trunk/kBuild/units/qt5.kmk (modified) (13 diffs)

trunk/kBuild/units/qt5.kmk

@@ -67 +67 @@
 #       PATH_SDK_QT5_LIB       - The lib directory for KBUILD_TARGET.
 ifndef PATH_SDK_QT5
- PATH_SDK_QT5 := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v4*)))
+ PATH_SDK_QT5 := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_TRG)/qt/v5*)))
  ifeq ($(PATH_SDK_QT5),)
   # If target == host, try look for Qt in the various platform specific places.
   ifeq ($(KBUILD_TARGET),$(KBUILD_HOST))
    ifeq ($(KBUILD_TARGET),darwin)
-    PATH_SDK_QT5 := $(patsubst %/Frameworks/QtCore.framework/Versions/4,%,$(firstword $(wildcard /Library/Frameworks/QtCore.framework/Versions/4)))
+    PATH_SDK_QT5 := $(patsubst %/Frameworks/QtCore.framework/Versions/5,%,$(firstword $(wildcard /Library/Frameworks/QtCore.framework/Versions/5)))
    else ifeq ($(KBUILD_TARGET),win)
     # No idea here yet...
@@ -83 +83 @@
         /usr/bin/qt4to5-qt5 \
         /usr/local/bin/qt4to5-qt5 \
-        /usr/qt/4/bin/qt4to5-qt5 \
+        /usr/qt/5/bin/qt4to5-qt5 \
         /usr/share/qt5/bin/qt4to5-qt5 \
         )))
@@ -90 +90 @@
         /usr/bin/qt4to5 \
         /usr/local/bin/qt4to5 \
-        /usr/qt/4/bin/qt4to5 \
+        /usr/qt/5/bin/qt4to5 \
         /usr/share/qt5/bin/qt4to5 \
         )))
@@ -98 +98 @@
         /usr/bin/rcc-qt5 \
         /usr/local/bin/rcc-qt5 \
-        /usr/qt/4/bin/rcc-qt5 \
+        /usr/qt/5/bin/rcc-qt5 \
         /usr/share/qt5/bin/rcc-qt5 \
         )))
@@ -106 +106 @@
         /usr/bin/rcc \
         /usr/local/bin/rcc \
-        /usr/qt/4/bin/rcc \
+        /usr/qt/5/bin/rcc \
         /usr/share/qt5/bin/rcc \
         )))
@@ -234 +234 @@
 endif
 ifndef PATH_TOOL_QT5_BIN
- PATH_TOOL_QT5_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/qt/v4*/bin)))
+ PATH_TOOL_QT5_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST)/qt/v5*/bin)))
  if "$(PATH_TOOL_QT5_BIN)" == "" && "$(KBUILD_DEVTOOLS_HST_ALT)" != ""
-  PATH_TOOL_QT5_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/qt/v4*/bin)))
+  PATH_TOOL_QT5_BIN := $(firstword $(rsort $(wildcard $(KBUILD_DEVTOOLS_HST_ALT)/qt/v5*/bin)))
  endif
  ifeq ($(PATH_TOOL_QT5_BIN),)
@@ -246 +246 @@
    PATH_TOOL_QT5_BIN := $(patsubst %/moc$(TOOL_QT5_BIN_SUFF),%,$(firstword $(wildcard \
          /usr/lib/qt5/bin/moc$(TOOL_QT5_BIN_SUFF) \
-         /usr/qt/4/bin/moc$(TOOL_QT5_BIN_SUFF) \
+         /usr/qt/5/bin/moc$(TOOL_QT5_BIN_SUFF) \
          /usr/share/qt5/bin/moc$(TOOL_QT5_BIN_SUFF) \
          /usr/local/bin/moc$(TOOL_QT5_BIN_SUFF) \
@@ -254 +254 @@
    PATH_TOOL_QT5_BIN := $(patsubst %/moc-qt5,%,$(firstword $(wildcard \
         /usr/lib/qt5/bin/moc-qt5 \
-        /usr/qt/4/bin/moc-qt5 \
+        /usr/qt/5/bin/moc-qt5 \
         /usr/share/qt5/bin/moc-qt5 \
         /usr/local/bin/moc-qt5 \
@@ -265 +265 @@
     PATH_TOOL_QT5_BIN := $(patsubst %/moc,%,$(firstword $(wildcard \
         /usr/lib/qt5/bin/moc \
-        /usr/qt/4/bin/moc \
+        /usr/qt/5/bin/moc \
         /usr/share/qt5/bin/moc \
         )))
@@ -274 +274 @@
    PATH_TOOL_QT5_BIN := $(patsubst %/qt4to5,%,$(firstword $(wildcard \
         /usr/lib/qt5/bin/qt4to5 \
-        /usr/qt/4/bin/qt4to5 \
+        /usr/qt/5/bin/qt4to5 \
         /usr/share/qt5/bin/qt4to5 \
         /usr/local/bin/qt4to5 \
@@ -283 +283 @@
    PATH_TOOL_QT5_BIN := $(patsubst %/rcc$(TOOL_QT5_BIN_SUFF),%,$(firstword $(wildcard \
         /usr/lib/qt5/bin/rcc$(TOOL_QT5_BIN_SUFF) \
-        /usr/qt/4/bin/rcc$(TOOL_QT5_BIN_SUFF) \
+        /usr/qt/5/bin/rcc$(TOOL_QT5_BIN_SUFF) \
         /usr/share/qt5/bin/rcc$(TOOL_QT5_BIN_SUFF) \
         /usr/local/bin/rcc$(TOOL_QT5_BIN_SUFF) \
@@ -292 +292 @@
    PATH_TOOL_QT5_BIN := $(patsubst %/rcc,%,$(firstword $(wildcard \
         /usr/lib/qt5/bin/rcc \
-        /usr/qt/4/bin/rcc \
+        /usr/qt/5/bin/rcc \
         /usr/share/qt5/bin/rcc \
         /usr/local/bin/rcc \
@@ -981 +981 @@
  $(eval $(target)_OBJCXXFLAGS += -F$(PATH_SDK_QT5_LIB) )
  $(eval $(target)_LDFLAGS  += -F$(PATH_SDK_QT5_LIB) $(foreach module,$(qt_modules), -framework $(qt_prefix)Qt$(module)$(qt_infix)) )
- $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/$(qt_prefix)Qt$(module)$(qt_infix).framework/Versions/4/Headers) )
+ $(eval $(target)_INCS     += $(foreach module,$(qt_modules), $(PATH_SDK_QT5_LIB)/$(qt_prefix)Qt$(module)$(qt_infix).framework/Versions/5/Headers) )
 else
  ifeq ($(bld_trg),win)