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

More Nokia -> Digia/QtProject changes

Browse Source 
Change-Id: If52505dbc95ee48ac3467cdfbbea91629c11089c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Eike Ziller
2012-10-09 12:21:04 +02:00
committed by Tobias Hunger
parent 2b56943a8e
commit 1504ca67fb
27 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,5 +4,5 @@ INCLUDEPATH += $$IDE_SOURCE_TREE/src/libs/3rdparty/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\\\"\"
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH/QtProject\\\"\"

2
tests/auto/externaltool/externaltool.pro
View File

@@ -1,7 +1,7 @@
IDE_BUILD_TREE = $$OUT_PWD/../../../
include(../qttest.pri)
include(../../../src/plugins/coreplugin/coreplugin.pri)
LIBS *= -L$$IDE_PLUGIN_PATH/Nokia
LIBS *= -L$$IDE_PLUGIN_PATH/QtProject
INCLUDEPATH *= $$IDE_SOURCE_TREE/src/plugins/coreplugin
INCLUDEPATH *= $$IDE_BUILD_TREE/src/plugins/coreplugin

4
tests/auto/qml/qmldesigner/coretests/coretests.pro
View File

@@ -9,9 +9,9 @@ OUT_PWD=QTCREATOR_BUILD
include($$IDE_SOURCE_TREE/src/plugins/qmldesigner/config.pri)
OUT_PWD=$$OUT_PWD_SAVE
LIBS += -L$$IDE_PLUGIN_PATH/Nokia
LIBS += -L$$IDE_PLUGIN_PATH/QtProject
unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/Nokia\'
unix: QMAKE_LFLAGS += \'-Wl,-rpath,$${IDE_LIBRARY_PATH}\' \'-Wl,-rpath,$${IDE_PLUGIN_PATH}/QtProject\'
QT += script \
network \

2
tests/auto/qttest.pri
View File

@@ -9,7 +9,7 @@ CONFIG -= app_bundle
!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
win32 {
lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/Nokia
lib = $$IDE_LIBRARY_PATH;$$IDE_PLUGIN_PATH/QtProject
lib ~= s,/,\\,g
# the below gets added to later by testcase.prf
check.commands = cd . & set PATH=$$lib;%PATH%& cmd /c

2
tests/auto/qttestrpath.pri
View File

@@ -1,6 +1,6 @@
linux-* {
QMAKE_RPATHDIR += $$IDE_BUILD_TREE/$$IDE_LIBRARY_BASENAME/qtcreator
QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/Nokia
QMAKE_RPATHDIR += $$IDE_PLUGIN_PATH/QtProject
IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":")