diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:59:08 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:59:08 +0100 |
| commit | 6bbde42f229a0613fe7198ee82dcbb57b252b364 (patch) | |
| tree | 74d532d080fc1a519b904119c86e48ffa2cdbc0c | |
| parent | fa04dd02866e39985d9e038a067abcee650a7069 (diff) | |
| parent | 9deef17ae9c85d8efdbceb515206ac31a4356216 (diff) | |
| download | qttools-6bbde42f229a0613fe7198ee82dcbb57b252b364.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: Ic736c7169dc07599f43ee8317cca78da42131e1a
| -rw-r--r-- | src/designer/src/components/lib/lib.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/designer/designer.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/lib.pro | 2 | ||||
| -rw-r--r-- | src/designer/src/sharedcomponents.pri | 22 | ||||
| -rw-r--r-- | src/designer/src/uitools/uitools.pro | 2 |
5 files changed, 0 insertions, 30 deletions
diff --git a/src/designer/src/components/lib/lib.pro b/src/designer/src/components/lib/lib.pro index 72110dffd..f37af3134 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 6eb07fddd..75d6f0826 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 b93bd5d7b..4ae41fe8c 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 8945138d6..000000000 --- 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 e526aa54a..db9e3f5ab 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) |