changeset 468:f826746491e6

build the native Qt tools from unpatched sources
author Volker Grabsch <vog@notjusthosting.com>
date Mon, 05 Oct 2009 10:43:48 +0200
parents dfd0873965ff
children c3b6cc491946
files src/qt.mk
diffstat 1 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/src/qt.mk	Sun Oct 04 22:00:37 2009 +0200
+++ b/src/qt.mk	Mon Oct 05 10:43:48 2009 +0200
@@ -40,14 +40,9 @@
 
 define $(PKG)_BUILD
 
-    # Note on patchfile qt-win32.patch
-    # A patchfile should have been applied already. Since we make a copy
-    # of the patched directory here, it is important that the changes
-    # in the patches do not break the native build.
-
-    # First configure a minimal native version of Qt
-    # for moc, rcc, uic and qmake
-    cp -a '$(1)' '$(1)'.native
+    # Native, unpatched build of Qt for moc, rcc, uic and qmake
+    cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,qt)
+    mv '$(1)/$(qt_SUBDIR)' '$(1).native'
     cd '$(1)'.native && ./configure \
         -opensource \
         -confirm-license \