diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index 72110dffdd4f4960855996113e0eca3de440b07c..f37af31342b63095409598ee7350cbda2091dba7 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 6eb07fdddbef140dd0dd6f745a092a1b3ded95ce..75d6f08268c837a5a7bc6ba1c0d7d5586a2c53b4 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 b93bd5d7b1c59cf3ce06a97b85c4a0d1c842cf26..4ae41fe8c6f0ca7ae850c9c48549c3d1bd14982e 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 8945138d6558fee1c5bf05f89f2a937e32ca686d..0000000000000000000000000000000000000000 --- 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 e526aa54a29bb22254cc3ae1a7c4f051271e58cc..db9e3f5ab073a864748df3d5847ee1edaf3ba3e8 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)