Commit 59c301a8 authored by con's avatar con

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.
parent 724f67b3
INCLUDEPATH *= $$PWD/build
LIBS *= -l$$qtLibraryTarget(Botan)
LIBS *= -l$$qtLibraryName(Botan)
INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
DEPENDPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus
LIBS *= -l$$qtLibraryTarget(CPlusPlus)
LIBS *= -l$$qtLibraryName(CPlusPlus)
......@@ -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
LIBS *= -l$$qtLibraryTarget(QtConcurrent)
LIBS *= -l$$qtLibraryName(QtConcurrent)
INCLUDEPATH *= $$PWD/../../shared/symbianutils
DEPENDPATH += $$PWD/../../shared/symbianutils
LIBS *= -l$$qtLibraryTarget(symbianutils)
LIBS *= -l$$qtLibraryName(symbianutils)
include(coreplugin_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Core)
LIBS *= -l$$qtLibraryName(Core)
include(cppeditor_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(CppEditor)
LIBS *= -l$$qtLibraryName(CppEditor)
include(cpptools_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(CppTools)
LIBS *= -l$$qtLibraryName(CppTools)
......@@ -2,4 +2,4 @@ include(debugger_dependencies.pri)
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
LIBS *= -l$$qtLibraryTarget(Debugger)
LIBS *= -l$$qtLibraryName(Debugger)
include(designer_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Designer)
LIBS *= -l$$qtLibraryName(Designer)
include(find_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Find)
LIBS *= -l$$qtLibraryName(Find)
include(locator_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Locator)
LIBS *= -l$$qtLibraryName(Locator)
include(projectexplorer_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(ProjectExplorer)
LIBS *= -l$$qtLibraryName(ProjectExplorer)
include(qmljseditor_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(QmlJSEditor)
LIBS *= -l$$qtLibraryName(QmlJSEditor)
include(qmlprojectmanager_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(QmlProjectManager)
LIBS *= -l$$qtLibraryName(QmlProjectManager)
include(qt4projectmanager_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(Qt4ProjectManager)
LIBS *= -l$$qtLibraryName(Qt4ProjectManager)
include(texteditor_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(TextEditor)
LIBS *= -l$$qtLibraryName(TextEditor)
include(vcsbase_dependencies.pri)
LIBS *= -l$$qtLibraryTarget(VCSBase)
LIBS *= -l$$qtLibraryName(VCSBase)
......@@ -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
......
......@@ -51,5 +51,5 @@ CONFIG += plugin plugin_with_soname
INSTALLS += target pluginspec
}
TARGET = $$qtLibraryTarget($$TARGET)
TARGET = $$qtLibraryName($$TARGET)
......@@ -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\\\"\"
......@@ -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
......
......@@ -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
......
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+=.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment