qt4: Port r25400 to qt-x11

SVN-Revision: 25403

diff --git a/Xorg/lib/qt4/files/x11-qmake.conf b/Xorg/lib/qt4/files/x11-qmake.conf
index 094c12935d7ff35991554e24ef6067b1028ad8f6..48c754199c5bc438b2b1a2488b0f82666c153a99 100644 (file)
--- 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_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_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
 
 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