qt4: Port r25400 to qt-x11

git-svn-id: svn://svn.openwrt.org/openwrt/packages@25403 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2011-02-07 17:00:57 +00:00
parent 2c81347811
commit 35b873d1f6

View File

@ -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