forked from qt-creator/qt-creator
Remove remaining PROVIDER references
Change-Id: I0bfcd7136ec0329cfe15983278c25f6b62415b68 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
8d587fa816
commit
2ce5b3bc0b
@@ -34,11 +34,7 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/Users/example/qtcreator-build
|
||||
# USE_USER_DESTDIR = yes
|
||||
#! [4]
|
||||
|
||||
#![5]
|
||||
PROVIDER = MyCompany
|
||||
#![5]
|
||||
|
||||
#! [6]
|
||||
#! [5]
|
||||
###### If the plugin can be depended upon by other plugins, this code needs to be outsourced to
|
||||
###### <dirname>_dependencies.pri, where <dirname> is the name of the directory containing the
|
||||
###### plugin's sources.
|
||||
@@ -54,10 +50,10 @@ QTC_PLUGIN_RECOMMENDS += \
|
||||
# optional plugin dependencies. nothing here at this time
|
||||
|
||||
###### End _dependencies.pri contents ######
|
||||
#! [6]
|
||||
#! [5]
|
||||
|
||||
#![7]
|
||||
#![6]
|
||||
include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri)
|
||||
|
||||
#![7]
|
||||
#![6]
|
||||
|
||||
|
||||
@@ -204,12 +204,6 @@
|
||||
|
||||
\snippet exampleplugin/example.pro 5
|
||||
|
||||
The \c{PROVIDER} variable is for example used to deploy your plugin to a provider specific
|
||||
plugin subdirectory, and the value is taken from the information that
|
||||
you gave in the plugin project wizard.
|
||||
|
||||
\snippet exampleplugin/example.pro 6
|
||||
|
||||
This section defines the name and dependencies of your plugin.
|
||||
The \c{QTC_PLUGIN_NAME} variable defines the name of your plugin, and the name of the
|
||||
dynamic library that is created for it. The \c{QTC_LIB_DEPENDS} variable is a list of
|
||||
@@ -220,7 +214,7 @@
|
||||
variable defines the \QC plugins that your plugin optionally depends on. For more information,
|
||||
see \l{Optional Dependencies}.
|
||||
|
||||
\snippet exampleplugin/example.pro 7
|
||||
\snippet exampleplugin/example.pro 6
|
||||
|
||||
The included file \c{qtcreatorplugin.pri} makes sure that you build a plugin that is suitable
|
||||
for use in \QC, by using the information you gave above.
|
||||
|
||||
@@ -6,7 +6,7 @@ CONFIG += shared
|
||||
SOURCES += "../plugin with space.cpp"
|
||||
|
||||
macx {
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
|
||||
} else:linux-* {
|
||||
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
|
||||
QMAKE_RPATHDIR += \$\$ORIGIN/..
|
||||
|
||||
@@ -6,7 +6,7 @@ CONFIG += shared
|
||||
SOURCES += "../plugin with space.cpp"
|
||||
|
||||
macx {
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/
|
||||
QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/
|
||||
} else:linux-* {
|
||||
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
|
||||
QMAKE_RPATHDIR += \$\$ORIGIN/..
|
||||
|
||||
Reference in New Issue
Block a user