From 59c301a8c8ce9daa2c47f4651b39c7a1fed7226c Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 29 Oct 2010 16:22:44 +0200
Subject: [PATCH] Make tests compile on Mac. Use qtLibraryName instead of
qtLibraryTarget.
qtLibraryTarget is only defined if used with TEMPLATE=lib, which makes
it fail in pri files that are used for app pro files. The tests still
don't run because of run time linking issues.
---
src/libs/3rdparty/botan/botan.pri | 2 +-
src/libs/cplusplus/cplusplus.pri | 2 +-
src/libs/qmljs/qmljs.pri | 2 +-
src/libs/qtconcurrent/qtconcurrent.pri | 2 +-
src/libs/symbianutils/symbianutils.pri | 2 +-
src/plugins/coreplugin/coreplugin.pri | 2 +-
src/plugins/cppeditor/cppeditor.pri | 2 +-
src/plugins/cpptools/cpptools.pri | 2 +-
src/plugins/debugger/debugger.pri | 2 +-
src/plugins/designer/designer.pri | 2 +-
src/plugins/find/find.pri | 2 +-
src/plugins/locator/locator.pri | 2 +-
src/plugins/projectexplorer/projectexplorer.pri | 2 +-
src/plugins/qmljseditor/qmljseditor.pri | 2 +-
src/plugins/qmlprojectmanager/qmlprojectmanager.pri | 2 +-
src/plugins/qt4projectmanager/qt4projectmanager.pri | 2 +-
src/plugins/texteditor/texteditor.pri | 2 +-
src/plugins/vcsbase/vcsbase.pri | 2 +-
src/qtcreatorlibrary.pri | 2 +-
src/qtcreatorplugin.pri | 2 +-
tests/auto/cplusplus/shared/shared.pri | 2 +-
tests/manual/ccdb/ccdb.pro | 2 +-
tests/manual/process/process.pro | 10 ++++------
tests/manual/ssh/ssh.pri | 13 ++++++-------
24 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri
index b1c924dab6d..e2c8f654095 100644
--- a/src/libs/3rdparty/botan/botan.pri
+++ b/src/libs/3rdparty/botan/botan.pri
@@ -1,2 +1,2 @@
INCLUDEPATH *= $$PWD/build
-LIBS *= -l$$qtLibraryTarget(Botan)
+LIBS *= -l$$qtLibraryName(Botan)
diff --git a/src/libs/cplusplus/cplusplus.pri b/src/libs/cplusplus/cplusplus.pri
index 50a03111e98..07e688609c8 100644
--- a/src/libs/cplusplus/cplusplus.pri
+++ b/src/libs/cplusplus/cplusplus.pri
@@ -1,3 +1,3 @@
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
-LIBS *= -l$$qtLibraryTarget(CPlusPlus)
+LIBS *= -l$$qtLibraryName(CPlusPlus)
diff --git a/src/libs/qmljs/qmljs.pri b/src/libs/qmljs/qmljs.pri
index 3e78a74a356..af334ef81f3 100644
--- a/src/libs/qmljs/qmljs.pri
+++ b/src/libs/qmljs/qmljs.pri
@@ -2,5 +2,5 @@ INCLUDEPATH += $$PWD/../../shared
INCLUDEPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser
DEPENDPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser
-LIBS *= -l$$qtLibraryTarget(QmlJS)
+LIBS *= -l$$qtLibraryName(QmlJS)
DEFINES += QT_CREATOR
diff --git a/src/libs/qtconcurrent/qtconcurrent.pri b/src/libs/qtconcurrent/qtconcurrent.pri
index 57929a4cf11..141de8ee8e2 100644
--- a/src/libs/qtconcurrent/qtconcurrent.pri
+++ b/src/libs/qtconcurrent/qtconcurrent.pri
@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(QtConcurrent)
+LIBS *= -l$$qtLibraryName(QtConcurrent)
diff --git a/src/libs/symbianutils/symbianutils.pri b/src/libs/symbianutils/symbianutils.pri
index 6d3b9b31228..c90d4da432b 100644
--- a/src/libs/symbianutils/symbianutils.pri
+++ b/src/libs/symbianutils/symbianutils.pri
@@ -1,3 +1,3 @@
INCLUDEPATH *= $$PWD/../../shared/symbianutils
DEPENDPATH += $$PWD/../../shared/symbianutils
-LIBS *= -l$$qtLibraryTarget(symbianutils)
+LIBS *= -l$$qtLibraryName(symbianutils)
diff --git a/src/plugins/coreplugin/coreplugin.pri b/src/plugins/coreplugin/coreplugin.pri
index fc5fc7aae61..26143cbc129 100644
--- a/src/plugins/coreplugin/coreplugin.pri
+++ b/src/plugins/coreplugin/coreplugin.pri
@@ -1,2 +1,2 @@
include(coreplugin_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(Core)
+LIBS *= -l$$qtLibraryName(Core)
diff --git a/src/plugins/cppeditor/cppeditor.pri b/src/plugins/cppeditor/cppeditor.pri
index c4d6fdf753e..e3f320ef004 100644
--- a/src/plugins/cppeditor/cppeditor.pri
+++ b/src/plugins/cppeditor/cppeditor.pri
@@ -1,3 +1,3 @@
include(cppeditor_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(CppEditor)
+LIBS *= -l$$qtLibraryName(CppEditor)
diff --git a/src/plugins/cpptools/cpptools.pri b/src/plugins/cpptools/cpptools.pri
index 1dffbfc5560..5732e896e70 100644
--- a/src/plugins/cpptools/cpptools.pri
+++ b/src/plugins/cpptools/cpptools.pri
@@ -1,3 +1,3 @@
include(cpptools_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(CppTools)
+LIBS *= -l$$qtLibraryName(CppTools)
diff --git a/src/plugins/debugger/debugger.pri b/src/plugins/debugger/debugger.pri
index 52045952fdc..d2df959e568 100644
--- a/src/plugins/debugger/debugger.pri
+++ b/src/plugins/debugger/debugger.pri
@@ -2,4 +2,4 @@ include(debugger_dependencies.pri)
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
-LIBS *= -l$$qtLibraryTarget(Debugger)
+LIBS *= -l$$qtLibraryName(Debugger)
diff --git a/src/plugins/designer/designer.pri b/src/plugins/designer/designer.pri
index d8af4897b38..829605d75e7 100644
--- a/src/plugins/designer/designer.pri
+++ b/src/plugins/designer/designer.pri
@@ -1,3 +1,3 @@
include(designer_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(Designer)
+LIBS *= -l$$qtLibraryName(Designer)
diff --git a/src/plugins/find/find.pri b/src/plugins/find/find.pri
index b28aec122f9..5ab55ec4342 100644
--- a/src/plugins/find/find.pri
+++ b/src/plugins/find/find.pri
@@ -1,3 +1,3 @@
include(find_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(Find)
+LIBS *= -l$$qtLibraryName(Find)
diff --git a/src/plugins/locator/locator.pri b/src/plugins/locator/locator.pri
index 1eb758b80e6..541771da514 100644
--- a/src/plugins/locator/locator.pri
+++ b/src/plugins/locator/locator.pri
@@ -1,3 +1,3 @@
include(locator_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(Locator)
+LIBS *= -l$$qtLibraryName(Locator)
diff --git a/src/plugins/projectexplorer/projectexplorer.pri b/src/plugins/projectexplorer/projectexplorer.pri
index fa0891a5fa2..8b464277e4e 100644
--- a/src/plugins/projectexplorer/projectexplorer.pri
+++ b/src/plugins/projectexplorer/projectexplorer.pri
@@ -1,2 +1,2 @@
include(projectexplorer_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(ProjectExplorer)
+LIBS *= -l$$qtLibraryName(ProjectExplorer)
diff --git a/src/plugins/qmljseditor/qmljseditor.pri b/src/plugins/qmljseditor/qmljseditor.pri
index 3bf969a302e..aac9022e3e5 100644
--- a/src/plugins/qmljseditor/qmljseditor.pri
+++ b/src/plugins/qmljseditor/qmljseditor.pri
@@ -1,3 +1,3 @@
include(qmljseditor_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(QmlJSEditor)
+LIBS *= -l$$qtLibraryName(QmlJSEditor)
diff --git a/src/plugins/qmlprojectmanager/qmlprojectmanager.pri b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
index fc1adf24f3e..948a5f9cc64 100644
--- a/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
+++ b/src/plugins/qmlprojectmanager/qmlprojectmanager.pri
@@ -1,2 +1,2 @@
include(qmlprojectmanager_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(QmlProjectManager)
+LIBS *= -l$$qtLibraryName(QmlProjectManager)
diff --git a/src/plugins/qt4projectmanager/qt4projectmanager.pri b/src/plugins/qt4projectmanager/qt4projectmanager.pri
index 34db66a9c4d..d3f03488b5f 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanager.pri
+++ b/src/plugins/qt4projectmanager/qt4projectmanager.pri
@@ -1,3 +1,3 @@
include(qt4projectmanager_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(Qt4ProjectManager)
+LIBS *= -l$$qtLibraryName(Qt4ProjectManager)
diff --git a/src/plugins/texteditor/texteditor.pri b/src/plugins/texteditor/texteditor.pri
index 9d3789b8253..c1c3e7a19ae 100644
--- a/src/plugins/texteditor/texteditor.pri
+++ b/src/plugins/texteditor/texteditor.pri
@@ -1,3 +1,3 @@
include(texteditor_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(TextEditor)
+LIBS *= -l$$qtLibraryName(TextEditor)
diff --git a/src/plugins/vcsbase/vcsbase.pri b/src/plugins/vcsbase/vcsbase.pri
index 56f7418c666..7ac74218c8e 100644
--- a/src/plugins/vcsbase/vcsbase.pri
+++ b/src/plugins/vcsbase/vcsbase.pri
@@ -1,3 +1,3 @@
include(vcsbase_dependencies.pri)
-LIBS *= -l$$qtLibraryTarget(VCSBase)
+LIBS *= -l$$qtLibraryName(VCSBase)
diff --git a/src/qtcreatorlibrary.pri b/src/qtcreatorlibrary.pri
index 35f2af4f24a..9b35abb390a 100644
--- a/src/qtcreatorlibrary.pri
+++ b/src/qtcreatorlibrary.pri
@@ -11,7 +11,7 @@ DESTDIR = $$IDE_LIBRARY_PATH
include(rpath.pri)
-TARGET = $$qtLibraryTarget($$TARGET)
+TARGET = $$qtLibraryName($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri
index f18f4f5b9ca..a13d519dc80 100644
--- a/src/qtcreatorplugin.pri
+++ b/src/qtcreatorplugin.pri
@@ -51,5 +51,5 @@ CONFIG += plugin plugin_with_soname
INSTALLS += target pluginspec
}
-TARGET = $$qtLibraryTarget($$TARGET)
+TARGET = $$qtLibraryName($$TARGET)
diff --git a/tests/auto/cplusplus/shared/shared.pri b/tests/auto/cplusplus/shared/shared.pri
index 2fb98dc31d9..fbef984bd69 100644
--- a/tests/auto/cplusplus/shared/shared.pri
+++ b/tests/auto/cplusplus/shared/shared.pri
@@ -4,4 +4,4 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
include($$IDE_SOURCE_TREE/src/plugins/cpptools/cpptools.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/Nokia
-DEFINES += Q_PLUGIN_PATH=\\\"$$IDE_PLUGIN_PATH/Nokia\\\"
+DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\"
diff --git a/tests/manual/ccdb/ccdb.pro b/tests/manual/ccdb/ccdb.pro
index 6021878be3e..13675b63d40 100644
--- a/tests/manual/ccdb/ccdb.pro
+++ b/tests/manual/ccdb/ccdb.pro
@@ -15,7 +15,7 @@ INCLUDEPATH *= $$CDB_CORE
# -- Add creator 'utils' lib
CREATOR_LIB_LIB = ../../../lib/qtcreator
LIBS *= -L$$CREATOR_LIB_LIB
-LIBS *= -l$$qtLibraryTarget(Utilsd)
+LIBS *= -l$$qtLibraryName(Utils)
CREATOR_LIB_SRC = ../../../src/libs
INCLUDEPATH *= $$CREATOR_LIB_SRC
diff --git a/tests/manual/process/process.pro b/tests/manual/process/process.pro
index 05c5e4a48c2..02094ebfab8 100644
--- a/tests/manual/process/process.pro
+++ b/tests/manual/process/process.pro
@@ -8,13 +8,11 @@
QT += core
QT += gui
+include(../../../qtcreator.pri)
+
# -- Add creator 'utils' lib
-CREATOR_LIB_LIB = ../../../lib/qtcreator
-LIBS *= -L$$CREATOR_LIB_LIB
-LIBS *= -l$$qtLibraryTarget(Utils)
-QMAKE_RPATHDIR*=$$CREATOR_LIB_LIB
-CREATOR_LIB_SRC = ../../../src/libs
-INCLUDEPATH *= $$CREATOR_LIB_SRC
+
+LIBS *= -l$$qtLibraryName(Utils)
TARGET = process
CONFIG += console
diff --git a/tests/manual/ssh/ssh.pri b/tests/manual/ssh/ssh.pri
index cdbe6778b47..ddf37d84e01 100644
--- a/tests/manual/ssh/ssh.pri
+++ b/tests/manual/ssh/ssh.pri
@@ -1,14 +1,13 @@
-INCLUDEPATH += ../../../../src/plugins
-CREATORLIBPATH = ../../../../lib/qtcreator
-PLUGINPATH=$$CREATORLIBPATH/plugins/Nokia
-LIBS *= -L$$PLUGINPATH -lCore
-LIBS *= -L$$CREATORLIBPATH
include (../../../qtcreator.pri)
-include (../../../src/plugins/coreplugin/coreplugin_dependencies.pri)
+include (../../../src/plugins/coreplugin/coreplugin.pri)
+
+INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins
+LIBS *= -L$$IDE_LIBRARY_PATH/Nokia
+
QT += core
QT -= gui
CONFIG += console
CONFIG -= app_bundle
TEMPLATE = app
DEPENDPATH+=.
-INCLUDEPATH+=.
\ No newline at end of file
+INCLUDEPATH+=.
--
GitLab