From 4615a8f88c7cfe065bc11fb262e777329af6dfa9 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@nokia.com>
Date: Tue, 15 Mar 2011 12:44:24 +0100
Subject: [PATCH] Make sure plugins on Linux resolve all dependencies
Remove the previous code which hardcoded options and didn't work for
linux-icc.
Reviewed-By: dt
---
qtcreator.pri | 6 ------
src/qtcreatorplugin.pri | 1 +
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/qtcreator.pri b/qtcreator.pri
index a2215a28b1e..73f0574df92 100644
--- a/qtcreator.pri
+++ b/qtcreator.pri
@@ -146,12 +146,6 @@ unix {
UI_DIR = $${OUT_PWD}/.uic
}
-linux-g++* {
- # Bail out on non-selfcontained libraries. Just a security measure
- # to prevent checking in code that does not compile on other platforms.
- QMAKE_LFLAGS += -Wl,--allow-shlib-undefined -Wl,--no-undefined
-}
-
win32-msvc* {
#Don't warn about sprintf, fopen etc being 'unsafe'
DEFINES += _CRT_SECURE_NO_WARNINGS
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index 09a0eee70ec..01a7c63b6b5 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -60,6 +60,7 @@ macx {
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
CONFIG += plugin plugin_with_soname
+linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
!macx {
target.path = /$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
--
GitLab