From bb01aa73653a6b9fef26db5b5a2a43532aa828ff Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <daniel.molkentin@nokia.com>
Date: Thu, 15 Oct 2009 16:12:03 +0200
Subject: [PATCH] Remove obsolete checks for qdoc3 < Qt 4.6.
---
doc/doc.pri | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/doc/doc.pri b/doc/doc.pri
index 8061a5adf85..b15059163f9 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -2,19 +2,6 @@ unix:QDOC_BIN = $$(QTDIR)/bin/qdoc3
win32:QDOC_BIN = $$(QTDIR)/bin/qdoc3.exe
win32:QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
-# legacy branch, can be dropped as soon as we depend on Qt 4.6
-!exists( $$QDOC_BIN ) {
- unix:QDOC_BIN = $$(QTDIR)/tools/qdoc3/qdoc3
- win32 {
- QDOC_BIN = $$(QTDIR)/tools/qdoc3/release/qdoc3.exe
- QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
- !exists( $$QDOC_BIN ) {
- QDOC_BIN = $$(QTDIR)/tools/qdoc3/debug/qdoc3.exe
- QDOC_BIN = $$replace(QDOC_BIN, "/", "\\")
- }
- }
-}
-
unix {
QDOC = SRCDIR=$$PWD OUTDIR=$$OUT_PWD/doc/html $$QDOC_BIN
HELPGENERATOR = $$(QTDIR)/bin/qhelpgenerator
--
GitLab