feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Make tests compile on Mac. Use qtLibraryName instead of qtLibraryTarget.

Browse Source 
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.
This commit is contained in:
con
2010-10-29 16:22:44 +02:00
parent 724f67b311
commit 59c301a8c8
24 changed files with 32 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/3rdparty/botan/botan.pri vendored
View File

@@ -1,2 +1,2 @@
INCLUDEPATH *= $$PWD/build INCLUDEPATH *= $$PWD/build
LIBS *= -l$$qtLibraryTarget(Botan) LIBS *= -l$$qtLibraryName(Botan)

2
src/libs/cplusplus/cplusplus.pri
View File

@@ -1,3 +1,3 @@
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
LIBS *= -l$$qtLibraryTarget(CPlusPlus) LIBS *= -l$$qtLibraryName(CPlusPlus)

2
src/libs/qmljs/qmljs.pri
View File

@@ -2,5 +2,5 @@ INCLUDEPATH += $$PWD/../../shared
INCLUDEPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser INCLUDEPATH += $$PWD/../../shared/qmljs $$PWD/../../shared/qmljs/parser
DEPENDPATH += $$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 DEFINES += QT_CREATOR

2
src/libs/qtconcurrent/qtconcurrent.pri
View File

@@ -1 +1 @@
LIBS *= -l$$qtLibraryTarget(QtConcurrent) LIBS *= -l$$qtLibraryName(QtConcurrent)

2
src/libs/symbianutils/symbianutils.pri
View File

@@ -1,3 +1,3 @@
INCLUDEPATH *= $$PWD/../../shared/symbianutils INCLUDEPATH *= $$PWD/../../shared/symbianutils
DEPENDPATH += $$PWD/../../shared/symbianutils DEPENDPATH += $$PWD/../../shared/symbianutils
LIBS *= -l$$qtLibraryTarget(symbianutils) LIBS *= -l$$qtLibraryName(symbianutils)

2
src/plugins/coreplugin/coreplugin.pri
View File

@@ -1,2 +1,2 @@
include(coreplugin_dependencies.pri) include(coreplugin_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Core) LIBS *= -l$$qtLibraryName(Core)

2
src/plugins/cppeditor/cppeditor.pri
View File

@@ -1,3 +1,3 @@
include(cppeditor_dependencies.pri) include(cppeditor_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(CppEditor) LIBS *= -l$$qtLibraryName(CppEditor)

2
src/plugins/cpptools/cpptools.pri
View File

@@ -1,3 +1,3 @@
include(cpptools_dependencies.pri) include(cpptools_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(CppTools) LIBS *= -l$$qtLibraryName(CppTools)

2
src/plugins/debugger/debugger.pri
View File

@@ -2,4 +2,4 @@ include(debugger_dependencies.pri)
INCLUDEPATH += $$PWD INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD DEPENDPATH += $$PWD
LIBS *= -l$$qtLibraryTarget(Debugger) LIBS *= -l$$qtLibraryName(Debugger)

2
src/plugins/designer/designer.pri
View File

@@ -1,3 +1,3 @@
include(designer_dependencies.pri) include(designer_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Designer) LIBS *= -l$$qtLibraryName(Designer)

2
src/plugins/find/find.pri
View File

@@ -1,3 +1,3 @@
include(find_dependencies.pri) include(find_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Find) LIBS *= -l$$qtLibraryName(Find)

2
src/plugins/locator/locator.pri
View File

@@ -1,3 +1,3 @@
include(locator_dependencies.pri) include(locator_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Locator) LIBS *= -l$$qtLibraryName(Locator)

2
src/plugins/projectexplorer/projectexplorer.pri
View File

@@ -1,2 +1,2 @@
include(projectexplorer_dependencies.pri) include(projectexplorer_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(ProjectExplorer) LIBS *= -l$$qtLibraryName(ProjectExplorer)

2
src/plugins/qmljseditor/qmljseditor.pri
View File

@@ -1,3 +1,3 @@
include(qmljseditor_dependencies.pri) include(qmljseditor_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(QmlJSEditor) LIBS *= -l$$qtLibraryName(QmlJSEditor)

2
src/plugins/qmlprojectmanager/qmlprojectmanager.pri
View File

@@ -1,2 +1,2 @@
include(qmlprojectmanager_dependencies.pri) include(qmlprojectmanager_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(QmlProjectManager) LIBS *= -l$$qtLibraryName(QmlProjectManager)

2
src/plugins/qt4projectmanager/qt4projectmanager.pri
View File

@@ -1,3 +1,3 @@
include(qt4projectmanager_dependencies.pri) include(qt4projectmanager_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Qt4ProjectManager) LIBS *= -l$$qtLibraryName(Qt4ProjectManager)

2
src/plugins/texteditor/texteditor.pri
View File

@@ -1,3 +1,3 @@
include(texteditor_dependencies.pri) include(texteditor_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(TextEditor) LIBS *= -l$$qtLibraryName(TextEditor)

2
src/plugins/vcsbase/vcsbase.pri
View File

@@ -1,3 +1,3 @@
include(vcsbase_dependencies.pri) include(vcsbase_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(VCSBase) LIBS *= -l$$qtLibraryName(VCSBase)

2
src/qtcreatorlibrary.pri
View File

@@ -11,7 +11,7 @@ DESTDIR = $$IDE_LIBRARY_PATH
include(rpath.pri) include(rpath.pri)
TARGET = $$qtLibraryTarget($$TARGET) TARGET = $$qtLibraryName($$TARGET)
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols

2
src/qtcreatorplugin.pri
View File

@@ -51,5 +51,5 @@ CONFIG += plugin plugin_with_soname
INSTALLS += target pluginspec INSTALLS += target pluginspec
} }
TARGET = $$qtLibraryTarget($$TARGET) TARGET = $$qtLibraryName($$TARGET)

2
tests/auto/cplusplus/shared/shared.pri
View File

@@ -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/plugins/cpptools/cpptools.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri) include($$IDE_SOURCE_TREE/src/rpath.pri)
LIBS += -L$$IDE_PLUGIN_PATH/Nokia LIBS += -L$$IDE_PLUGIN_PATH/Nokia
DEFINES += Q_PLUGIN_PATH=\\\"$$IDE_PLUGIN_PATH/Nokia\\\" DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/Nokia\\\"\"

2
tests/manual/ccdb/ccdb.pro
View File

@@ -15,7 +15,7 @@ INCLUDEPATH *= $$CDB_CORE
# -- Add creator 'utils' lib # -- Add creator 'utils' lib
CREATOR_LIB_LIB = ../../../lib/qtcreator CREATOR_LIB_LIB = ../../../lib/qtcreator
LIBS *= -L$$CREATOR_LIB_LIB LIBS *= -L$$CREATOR_LIB_LIB
LIBS *= -l$$qtLibraryTarget(Utilsd) LIBS *= -l$$qtLibraryName(Utils)
CREATOR_LIB_SRC = ../../../src/libs CREATOR_LIB_SRC = ../../../src/libs
INCLUDEPATH *= $$CREATOR_LIB_SRC INCLUDEPATH *= $$CREATOR_LIB_SRC

10
tests/manual/process/process.pro
View File

@@ -8,13 +8,11 @@
QT += core QT += core
QT += gui QT += gui
include(../../../qtcreator.pri)
# -- Add creator 'utils' lib # -- Add creator 'utils' lib
CREATOR_LIB_LIB = ../../../lib/qtcreator
LIBS *= -L$$CREATOR_LIB_LIB LIBS *= -l$$qtLibraryName(Utils)
LIBS *= -l$$qtLibraryTarget(Utils)
QMAKE_RPATHDIR*=$$CREATOR_LIB_LIB
CREATOR_LIB_SRC = ../../../src/libs
INCLUDEPATH *= $$CREATOR_LIB_SRC
TARGET = process TARGET = process
CONFIG += console CONFIG += console

11
tests/manual/ssh/ssh.pri
View File

@@ -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 (../../../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 += core
QT -= gui QT -= gui
CONFIG += console CONFIG += console