Remove dependency to ActiveQt sources in designer plugin.
authorMiikka Heikkinen <miikka.heikkinen@digia.com>
Wed, 5 Dec 2012 14:00:30 +0000 (16:00 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 7 Dec 2012 07:48:24 +0000 (08:48 +0100)
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>
src/designer/src/plugins/activeqt/activeqt.pro

index 80837c3..610ce38 100644 (file)
@@ -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