diff options
Diffstat (limited to 'patches/0065-Changed-path-references-to-ActiveQt.patch')
| -rw-r--r-- | patches/0065-Changed-path-references-to-ActiveQt.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/0065-Changed-path-references-to-ActiveQt.patch b/patches/0065-Changed-path-references-to-ActiveQt.patch index fd27886..acebbc3 100644 --- a/patches/0065-Changed-path-references-to-ActiveQt.patch +++ b/patches/0065-Changed-path-references-to-ActiveQt.patch @@ -1,4 +1,4 @@ -From 8f10d0ea1cb8486ebacb12f92d68b66968c4ad95 Mon Sep 17 00:00:00 2001 +From a7f3d2673743bad6baf16b92c42cc18b2ffc5d02 Mon Sep 17 00:00:00 2001 From: axis <[email protected]> Date: Thu, 27 Jan 2011 09:47:08 +0100 Subject: [PATCH] Changed path references to ActiveQt. @@ -24,7 +24,7 @@ index 34c6dfe..2d0ff85 100644 dumpcpp_decl.commands = $$QMAKE_DUMPCPP ${QMAKE_FILE_IN} -o ${QMAKE_FILE_BASE} diff --git a/qtbase/mkspecs/features/win32/qaxserver.prf b/qtbase/mkspecs/features/win32/qaxserver.prf -index 2899976..6022a3f 100644 +index a6c0869..678c2cc 100644 --- a/qtbase/mkspecs/features/win32/qaxserver.prf +++ b/qtbase/mkspecs/features/win32/qaxserver.prf @@ -7,6 +7,7 @@ ACTIVEQT_VERSION = $$VERSION @@ -33,9 +33,9 @@ index 2899976..6022a3f 100644 DEFINES += QAXSERVER +INCLUDEPATH += $$QT.activeqt.includes - ACTIVEQT_IDE = makefile - equals(TEMPLATE_PREFIX, "vc"):ACTIVEQT_IDE = VisualStudio -@@ -62,4 +63,6 @@ qt:!target_qt { + contains(TEMPLATE, "vc.*") { + ACTIVEQT_IDC = $${QMAKE_IDC} ### Qt5: remove me +@@ -56,4 +57,6 @@ qt:!target_qt { QMAKE_LIBS_QT_ENTRY = -lQAxServer } dll:QMAKE_LIBS += $$QMAKE_LIBS_QT_ENTRY @@ -43,5 +43,5 @@ index 2899976..6022a3f 100644 + QMAKE_LIBS += $$QMAKE_LIBS_GUI } -- -1.7.3.2.343.g7d43d +1.7.3.4 |