Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a

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
 #

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

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)

src/designer/src/sharedcomponents.pri

-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)
-    }
-}

src/designer/src/uitools/uitools.pro

@@ -14,5 +14,3 @@ DEFINES += \
     QT_DESIGNER_STATIC
 
 include(../lib/uilib/uilib.pri)
-
-include(../sharedcomponents.pri)