From 35b873d1f6d6864b7029232a06c8fa6d415d898a Mon Sep 17 00:00:00 2001 From: mb Date: Mon, 7 Feb 2011 17:00:57 +0000 Subject: [PATCH] qt4: Port r25400 to qt-x11 git-svn-id: svn://svn.openwrt.org/openwrt/packages@25403 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- Xorg/lib/qt4/files/x11-qmake.conf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Xorg/lib/qt4/files/x11-qmake.conf b/Xorg/lib/qt4/files/x11-qmake.conf index 094c12935..48c754199 100644 --- a/Xorg/lib/qt4/files/x11-qmake.conf +++ b/Xorg/lib/qt4/files/x11-qmake.conf @@ -14,17 +14,17 @@ QMAKE_INCDIR_QT = $$(TARGET_INCDIRS) QMAKE_LIBDIR_QT = $$(TARGET_LIBDIRS) QMAKE_INCDIR = $$(TARGET_INCDIRS) QMAKE_LIBDIR = $$(TARGET_LIBDIRS) -QMAKE_MOC = $$(STAGING_DIR_HOST)/bin/moc -QMAKE_UIC = $$(STAGING_DIR_HOST)/bin/uic -QMAKE_RCC = $$(STAGING_DIR_HOST)/bin/rcc -QMAKE_CC = $$(TARGET_CC) -QMAKE_CXX = $$(TARGET_CXX) -QMAKE_AR = $$(TARGET_CROSS)ar cqs -QMAKE_OBJCOPY = $$(TARGET_CROSS)objcopy -QMAKE_RANLIB = $$(TARGET_CROSS)ranlib +QMAKE_MOC = $$(STAGING_DIR_HOST)/bin/moc +QMAKE_UIC = $$(STAGING_DIR_HOST)/bin/uic +QMAKE_RCC = $$(STAGING_DIR_HOST)/bin/rcc +QMAKE_CC = $$(TARGET_CC) +QMAKE_CXX = $$(TARGET_CXX) +QMAKE_AR = $$(TARGET_AR) +QMAKE_OBJCOPY = $$(TARGET_OBJCOPY) +QMAKE_RANLIB = $$(TARGET_RANLIB) QMAKE_CFLAGS = $$(TARGET_CFLAGS) QMAKE_CXXFLAGS = $$(TARGET_CFLAGS) -QMAKE_LINK = $$(TARGET_CXX) +QMAKE_LINK = $$(TARGET_CXX) QMAKE_LINK_C = $$(TARGET_CC) QMAKE_LFLAGS = $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options