From 3f6834be78250ede97c48eb02773f7a29d4f896a Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Wed, 5 Dec 2012 16:00:30 +0200 Subject: [PATCH] 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 Reviewed-by: Friedemann Kleint Reviewed-by: Oswald Buddenhagen --- src/designer/src/plugins/activeqt/activeqt.pro | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 -- 2.7.4