From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 5 Dec 2012 14:00:30 +0000 (+0200)
Subject: Remove dependency to ActiveQt sources in designer plugin.
X-Git-Tag: accepted/tizen/20131212.181521~128^2~52
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f6834be78250ede97c48eb02773f7a29d4f896a;p=platform%2Fupstream%2Fqttools.git

Remove dependency to ActiveQt sources in designer plugin.

Seems that building using qaxtypes.* directly from qtactiveqt repo
is unnecessary, so remove them.

Task-number: QTBUG-26848
Change-Id: I4a5e071b83697fd6ee83a742cba6ae13c8b343fb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---

diff --git a/src/designer/src/plugins/activeqt/activeqt.pro b/src/designer/src/plugins/activeqt/activeqt.pro
index 80837c3..610ce38 100644
--- a/src/designer/src/plugins/activeqt/activeqt.pro
+++ b/src/designer/src/plugins/activeqt/activeqt.pro
@@ -3,23 +3,19 @@ QT         += widgets designer-private axcontainer
 
 include(../plugins.pri)
 
-INCLUDEPATH += $$QT.activeqt.sources/shared/ \
-               $$QT.activeqt.sources/container \
-               ../../lib/uilib \
+INCLUDEPATH += ../../lib/uilib \
                $$QT.designer.includes
 
 SOURCES += qaxwidgetextrainfo.cpp \
 qaxwidgetplugin.cpp \
 qdesigneraxwidget.cpp \
 qaxwidgetpropertysheet.cpp \
-qaxwidgettaskmenu.cpp \
-    $$QT.axcontainer.sources/../shared/qaxtypes.cpp
+qaxwidgettaskmenu.cpp
 
 HEADERS += qaxwidgetextrainfo.h \
 qaxwidgetplugin.h \
 qdesigneraxwidget.h \
 qaxwidgetpropertysheet.h \
-qaxwidgettaskmenu.h \
-    $$QT.axcontainer.sources/../shared/qaxtypes.h
+qaxwidgettaskmenu.h
 
 OTHER_FILES += activeqt.json