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.
2010-10-29 16:22:44 +02:00
parent 724f67b311
commit 59c301a8c8
24 changed files with 32 additions and 35 deletions
--- 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)
--- 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)
--- 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
--- a/src/libs/qtconcurrent/qtconcurrent.pri
+++ b/src/libs/qtconcurrent/qtconcurrent.pri
@@ -1 +1 @@
-LIBS *= -l$$qtLibraryTarget(QtConcurrent)
+LIBS *= -l$$qtLibraryName(QtConcurrent)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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)
--- 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

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

--- 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\\\"\"
--- 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

--- 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
--- a/tests/manual/ssh/ssh.pri
+++ b/tests/manual/ssh/ssh.pri
@@ -1,10 +1,9 @@
-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