From 28fd0776a7d77705ed5805863ab9b7de3b70e1af Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@theqtcompany.com>
Date: Wed, 25 Feb 2015 15:17:51 +0100
Subject: Extras: update QMAKE_DOCS after removing compatibility .qdocconf
 file.

Change-Id: I0ef9396789c5ddfcc22553aa8cd74f76ad7d9f6e
Reviewed-by: Caroline Chao <caroline.chao@theqtcompany.com>
---
 src/extras/extras.pro | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/extras')

diff --git a/src/extras/extras.pro b/src/extras/extras.pro
index a0c3e5b2..cc2d2958 100644
--- a/src/extras/extras.pro
+++ b/src/extras/extras.pro
@@ -4,12 +4,7 @@ IMPORT_VERSION = 1.3
 
 QT += qml
 
-# Qt 5.1 requires a different set of includes for .qdocconf
-equals(QT_MAJOR_VERSION, 5):!greaterThan(QT_MINOR_VERSION, 1) {
-    QMAKE_DOCS = $$PWD/doc/compat/qtquickextras.qdocconf
-} else {
-    QMAKE_DOCS = $$PWD/doc/qtquickextras.qdocconf
-}
+QMAKE_DOCS = $$PWD/doc/qtquickextras.qdocconf
 
 CONTROLS_QML_FILES = \
     CircularGauge.qml \
-- 
cgit v1.2.1