From 9deef17ae9c85d8efdbceb515206ac31a4356216 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Dec 2012 16:17:47 +0100 Subject: [PATCH] nuke sharedcomponents.pri it doesn't actually do anything useful for quite a while Change-Id: Ibe52bd7408227655ae8295d78823105163385897 Reviewed-by: Friedemann Kleint Reviewed-by: Joerg Bornemann --- src/designer/src/components/lib/lib.pro | 2 -- src/designer/src/designer/designer.pro | 2 -- src/designer/src/lib/lib.pro | 2 -- src/designer/src/sharedcomponents.pri | 22 ---------------------- src/designer/src/uitools/uitools.pro | 2 -- 5 files changed, 30 deletions(-) delete mode 100644 src/designer/src/sharedcomponents.pri diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index 72110df..f37af31 100644 --- a/src/designer/src/components/lib/lib.pro +++ b/src/designer/src/components/lib/lib.pro @@ -35,8 +35,6 @@ include(../tabordereditor/tabordereditor.pri) PRECOMPILED_HEADER= lib_pch.h -include(../../sharedcomponents.pri) - # MinGW GCC cc1plus crashes when using precompiled header # Date Checked: 3rd September 2012 # diff --git a/src/designer/src/designer/designer.pro b/src/designer/src/designer/designer.pro index 6eb07fd..75d6f08 100644 --- a/src/designer/src/designer/designer.pro +++ b/src/designer/src/designer/designer.pro @@ -79,6 +79,4 @@ mac { target.path=$$[QT_INSTALL_BINS] INSTALLS += target -include(../sharedcomponents.pri) - unix:!mac:LIBS += -lm diff --git a/src/designer/src/lib/lib.pro b/src/designer/src/lib/lib.pro index b93bd5d..4ae41fe 100644 --- a/src/designer/src/lib/lib.pro +++ b/src/designer/src/lib/lib.pro @@ -19,5 +19,3 @@ include(sdk/sdk.pri) include(shared/shared.pri) include(uilib/uilib.pri) PRECOMPILED_HEADER=lib_pch.h - -include(../sharedcomponents.pri) diff --git a/src/designer/src/sharedcomponents.pri b/src/designer/src/sharedcomponents.pri deleted file mode 100644 index 8945138..0000000 --- a/src/designer/src/sharedcomponents.pri +++ /dev/null @@ -1,22 +0,0 @@ -contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE - -for(QTSHAREDLIB, $$list($$unique(LIBS))) { - QT_SHARED_LIB_NAME = - isEqual(QTSHAREDLIB, -lformeditor):QT_SHARED_LIB_NAME = formeditor - else:isEqual(QTSHAREDLIB, -lobjectinspector):QT_SHARED_LIB_NAME = objectinspector - else:isEqual(QTSHAREDLIB, -lpropertyeditor):QT_SHARED_LIB_NAME = propertyeditor - else:isEqual(QTSHAREDLIB, -lwidgetbox):QT_SHARED_LIB_NAME = widgetbox - else:isEqual(QTSHAREDLIB, -lsignalsloteditor):QT_SHARED_LIB_NAME = signalsloteditor - else:isEqual(QTSHAREDLIB, -ltabordereditor):QT_SHARED_LIB_NAME = tabordereditor - else:isEqual(QTSHAREDLIB, -lresourceeditor):QT_SHARED_LIB_NAME = resourceeditor - else:isEqual(QTSHAREDLIB, -lbuddyeditor):QT_SHARED_LIB_NAME = buddyeditor - else:isEqual(QTSHAREDLIB, -ltaskmenu):QT_SHARED_LIB_NAME = taskmenu - else:isEqual(QTSHAREDLIB, -lQtDesigner):QT_SHARED_LIB_NAME = QtDesigner - else:isEqual(QTSHAREDLIB, -lQtDesignerComponents):QT_SHARED_LIB_NAME = QtDesignerComponents - else:isEqual(QTSHAREDLIB, -lQtOpenGL):QT_SHARED_LIB_NAME = QtOpenGL - - !isEmpty(QT_SHARED_LIB_NAME) { - LIBS -= -l$${QT_SHARED_LIB_NAME} - qtAddLibrary($$QT_SHARED_LIB_NAME) - } -} diff --git a/src/designer/src/uitools/uitools.pro b/src/designer/src/uitools/uitools.pro index e526aa5..db9e3f5 100644 --- a/src/designer/src/uitools/uitools.pro +++ b/src/designer/src/uitools/uitools.pro @@ -14,5 +14,3 @@ DEFINES += \ QT_DESIGNER_STATIC include(../lib/uilib/uilib.pri) - -include(../sharedcomponents.pri) -- 2.7.4