forked from qt-creator/qt-creator
unify _LIBRARY defines
The _LIBRARY defines for plugins should consist of the plugin name plus the suffix _LIBRARY to make it possible to generate those automatically. Change-Id: Icafc9bce876d77521b47d815c94e7df6da061a51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
DEFINES += ANALYZER_LIBRARY
|
DEFINES += ANALYZERBASE_LIBRARY
|
||||||
|
|
||||||
include(../../qtcreatorplugin.pri)
|
include(../../qtcreatorplugin.pri)
|
||||||
|
|
||||||
|
|||||||
@@ -12,9 +12,6 @@ QtcPlugin {
|
|||||||
Depends { name: "ProjectExplorer" }
|
Depends { name: "ProjectExplorer" }
|
||||||
Depends { name: "TextEditor" }
|
Depends { name: "TextEditor" }
|
||||||
|
|
||||||
Depends { name: "cpp" }
|
|
||||||
cpp.defines: base.concat("ANALYZER_LIBRARY")
|
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"analyzerbase.qrc",
|
"analyzerbase.qrc",
|
||||||
"analyzerbase_global.h",
|
"analyzerbase_global.h",
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
|
|
||||||
#include <qglobal.h>
|
#include <qglobal.h>
|
||||||
|
|
||||||
#if defined(ANALYZER_LIBRARY)
|
#if defined(ANALYZERBASE_LIBRARY)
|
||||||
# define ANALYZER_EXPORT Q_DECL_EXPORT
|
# define ANALYZER_EXPORT Q_DECL_EXPORT
|
||||||
#else
|
#else
|
||||||
# define ANALYZER_EXPORT Q_DECL_IMPORT
|
# define ANALYZER_EXPORT Q_DECL_IMPORT
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ include(../../qtcreatorplugin.pri)
|
|||||||
include(pythoneditor_dependencies.pri)
|
include(pythoneditor_dependencies.pri)
|
||||||
|
|
||||||
DEFINES += \
|
DEFINES += \
|
||||||
PYEDITOR_LIBRARY
|
PYTHONEDITOR_LIBRARY
|
||||||
|
|
||||||
OTHER_FILES += PythonEditor.pluginspec.in \
|
OTHER_FILES += PythonEditor.pluginspec.in \
|
||||||
pythoneditor.mimetypes.xml
|
pythoneditor.mimetypes.xml
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ QtcPlugin {
|
|||||||
Depends { name: "CppTools" }
|
Depends { name: "CppTools" }
|
||||||
Depends { name: "QtSupport" }
|
Depends { name: "QtSupport" }
|
||||||
Depends { name: "ProjectExplorer" }
|
Depends { name: "ProjectExplorer" }
|
||||||
Depends { name: "cpp" }
|
|
||||||
|
|
||||||
cpp.defines: base.concat(["PYEDITOR_LIBRARY"])
|
|
||||||
|
|
||||||
files: [
|
files: [
|
||||||
"pythoneditor.cpp",
|
"pythoneditor.cpp",
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
#if defined(PYEDITOR_LIBRARY)
|
#if defined(PYTHONEDITOR_LIBRARY)
|
||||||
# define PYEDITOR_EXPORT Q_DECL_EXPORT
|
# define PYEDITOR_EXPORT Q_DECL_EXPORT
|
||||||
#else
|
#else
|
||||||
# define PYEDITOR_EXPORT Q_DECL_IMPORT
|
# define PYEDITOR_EXPORT Q_DECL_IMPORT
|
||||||
|
|||||||
Reference in New Issue
Block a user