Skip to content
Snippets Groups Projects
Commit 59c301a8 authored by con's avatar con
Browse files

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
No related branches found
No related tags found
No related merge requests found
...@@ -4,4 +4,4 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/shared/cplusplus ...@@ -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\\\"\"
...@@ -15,7 +15,7 @@ INCLUDEPATH *= $$CDB_CORE ...@@ -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
......
...@@ -8,13 +8,11 @@ ...@@ -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
......
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
CONFIG -= app_bundle CONFIG -= app_bundle
TEMPLATE = app TEMPLATE = app
DEPENDPATH+=. DEPENDPATH+=.
INCLUDEPATH+=. INCLUDEPATH+=.
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment