Commit 1898ba5a authored by Tim Jenssen's avatar Tim Jenssen

make library defines more consistency

Change-Id: I211d511667d5b9c8f518bfbe750aca4483baff62
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
parent 1ff8b46d
......@@ -29,7 +29,7 @@
#include <cstdlib>
#include <cstddef>
#if defined(GLSL_BUILD_LIB)
#if defined(GLSL_LIBRARY)
# define GLSL_EXPORT Q_DECL_EXPORT
#elif defined(GLSL_BUILD_STATIC_LIB)
# define GLSL_EXPORT
......
DEFINES += \
GLSL_BUILD_LIB
GLSL_LIBRARY
include(../../qtcreatorlibrary.pri)
include(glsl-lib.pri)
......@@ -4,7 +4,7 @@ QtcLibrary {
name: "GLSL"
cpp.defines: base.concat([
"GLSL_BUILD_LIB"
"GLSL_LIBRARY"
])
Depends { name: "Qt.gui" }
......
contains(CONFIG, dll) {
DEFINES += LANGUAGEUTILS_BUILD_DIR
DEFINES += LANGUAGEUTILS_LIBRARY
} else {
DEFINES += LANGUAGEUTILS_BUILD_STATIC_LIB
}
......
......@@ -6,7 +6,7 @@ Project {
QtcDevHeaders { }
QtcLibrary {
cpp.defines: base.concat(["LANGUAGEUTILS_BUILD_DIR"])
cpp.defines: base.concat(["LANGUAGEUTILS_LIBRARY"])
cpp.optimization: "fast"
Depends { name: "Qt.core" }
......
......@@ -27,7 +27,7 @@
#include <qglobal.h>
#if defined(LANGUAGEUTILS_BUILD_DIR)
#if defined(LANGUAGEUTILS_LIBRARY)
# define LANGUAGEUTILS_EXPORT Q_DECL_EXPORT
#elif defined(LANGUAGEUTILS_BUILD_STATIC_LIB)
# define LANGUAGEUTILS_EXPORT
......
......@@ -4,7 +4,7 @@ include(../../qtcreatorlibrary.pri)
!isEmpty(QT.svg.name): QT += svg
else: DEFINES += QT_NO_SVG
DEFINES += QMT_LIBRARY
DEFINES += MODELING_LIBRARY
INCLUDEPATH += $$PWD $$PWD/qtserialization/inc
......
......@@ -3,7 +3,7 @@ import qbs 1.0
QtcLibrary {
name: "Modeling"
cpp.defines: base.concat("QMT_LIBRARY")
cpp.defines: base.concat("MODELING_LIBRARY")
cpp.includePaths: base.concat([
".",
"./qtserialization/inc",
......
......@@ -27,7 +27,7 @@
#include <QtCore/QtGlobal>
#if defined(QMT_LIBRARY)
#if defined(MODELING_LIBRARY)
# define QMT_EXPORT Q_DECL_EXPORT
#else
# define QMT_EXPORT Q_DECL_IMPORT
......
contains(CONFIG, dll) {
DEFINES += QMLDEBUG_LIB
DEFINES += QMLDEBUG_LIBRARY
} else {
DEFINES += QMLDEBUG_STATIC_LIB
}
......
......@@ -6,7 +6,7 @@ Project {
QtcDevHeaders { }
QtcLibrary {
cpp.defines: base.concat("QMLDEBUG_LIB")
cpp.defines: base.concat("QMLDEBUG_LIBRARY")
Depends { name: "Qt"; submodules: ["gui", "network"] }
Depends { name: "Utils" }
......
......@@ -25,7 +25,7 @@
#pragma once
#if defined(QMLDEBUG_LIB)
#if defined(QMLDEBUG_LIBRARY)
# define QMLDEBUG_EXPORT Q_DECL_EXPORT
#elif defined(QMLDEBUG_STATIC_LIB)
# define QMLDEBUG_EXPORT
......
contains(CONFIG, dll) {
DEFINES += BUILD_QMLEDITORWIDGETS_LIB
DEFINES += QMLEDITORWIDGETS_LIBRARY
} else {
DEFINES += BUILD_QMLEDITORWIDGETS_STATIC_LIB
}
......
......@@ -4,7 +4,7 @@ QtcLibrary {
name: "QmlEditorWidgets"
cpp.defines: base.concat([
"BUILD_QMLEDITORWIDGETS_LIB"
"QMLEDITORWIDGETS_LIBRARY"
])
cpp.optimization: "fast"
......
......@@ -27,7 +27,7 @@
#include <qglobal.h>
# if defined(BUILD_QMLEDITORWIDGETS_LIB)
# if defined(QMLEDITORWIDGETS_LIBRARY)
# define QMLEDITORWIDGETS_EXPORT Q_DECL_EXPORT
# elif defined(BUILD_QMLJSDEBUGGER_STATIC_LIB)
# define QMLEDITORWIDGETS_EXPORT
......
......@@ -42,13 +42,13 @@
# define QT_QML_BEGIN_NAMESPACE
# define QT_QML_END_NAMESPACE
# ifdef QMLJS_BUILD_DIR
# ifdef QMLJS_LIBRARY
# define QML_PARSER_EXPORT Q_DECL_EXPORT
# elif QML_BUILD_STATIC_LIB
# define QML_PARSER_EXPORT
# else
# define QML_PARSER_EXPORT Q_DECL_IMPORT
# endif // QMLJS_BUILD_DIR
# endif // QMLJS_LIBRARY
#else // !QT_CREATOR
# define QT_QML_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
......
contains(CONFIG, dll) {
DEFINES += QMLJS_BUILD_DIR
DEFINES += QMLJS_LIBRARY
} else {
DEFINES += QML_BUILD_STATIC_LIB
}
......
DEFINES += QMLJS_BUILD_DIR
DEFINES += QMLJS_LIBRARY
include(../../qtcreatorlibrary.pri)
include(qmljs-lib.pri)
......@@ -6,7 +6,7 @@ Project {
QtcDevHeaders { }
QtcLibrary {
cpp.defines: base.concat(["QMLJS_BUILD_DIR"])
cpp.defines: base.concat(["QMLJS_LIBRARY"])
cpp.optimization: "fast"
Depends { name: "ExtensionSystem" }
......
......@@ -27,7 +27,7 @@
#include <qglobal.h>
#if defined(QMLJS_BUILD_DIR)
#if defined(QMLJS_LIBRARY)
# define QMLJS_EXPORT Q_DECL_EXPORT
#elif defined(QML_BUILD_STATIC_LIB)
# define QMLJS_EXPORT
......
QT += gui network
DEFINES += QSSH_LIBRARY
DEFINES += QTCSSH_LIBRARY
include(../../qtcreatorlibrary.pri)
......
......@@ -7,7 +7,7 @@ Project {
QtcDevHeaders { }
QtcLibrary {
cpp.defines: base.concat(["QSSH_LIBRARY"]).concat(botanDefines)
cpp.defines: base.concat(["QTCSSH_LIBRARY"]).concat(botanDefines)
cpp.includePaths: botanIncludes
cpp.dynamicLibraries: botanLibs
cpp.enableExceptions: true
......
......@@ -27,7 +27,7 @@
#include <QtGlobal>
#if defined(QSSH_LIBRARY)
#if defined(QTCSSH_LIBRARY)
# define QSSH_EXPORT Q_DECL_EXPORT
#else
# define QSSH_EXPORT Q_DECL_IMPORT
......
contains(CONFIG, dll) {
DEFINES += QTCREATOR_UTILS_LIB
DEFINES += UTILS_LIBRARY
} else {
DEFINES += QTCREATOR_UTILS_STATIC_LIB
}
......
......@@ -9,7 +9,7 @@ Project {
QtcLibrary {
cpp.defines: base.concat([
"QTCREATOR_UTILS_LIB",
"UTILS_LIBRARY",
"QTC_REL_TOOLS_PATH=\"" + FileInfo.relativePath('/' + qtc.ide_bin_path,
'/' + qtc.ide_libexec_path) + "\""
])
......
......@@ -27,7 +27,7 @@
#include <qglobal.h>
#if defined(QTCREATOR_UTILS_LIB)
#if defined(UTILS_LIBRARY)
# define QTCREATOR_UTILS_EXPORT Q_DECL_EXPORT
#elif defined(QTCREATOR_UTILS_STATIC_LIB) // Abuse single files for manual tests
# define QTCREATOR_UTILS_EXPORT
......
QTC_LIB_DEPENDS += cplusplus utils extensionsystem
include(../../../qttest.pri)
include($$IDE_SOURCE_TREE/src/rpath.pri)
DEFINES += QMLJS_BUILD_DIR
DEFINES += QMLJS_LIBRARY
QT += qml xml
# direct dependency on qmljs for quicker turnaround when editing them
......
......@@ -12,7 +12,7 @@ SOURCES += \
tst_testtrie.cpp
TEMPLATE = app
DEFINES += QMLJS_BUILD_DIR
DEFINES += QMLJS_LIBRARY
DISTFILES += \
listAll.data \
......
......@@ -5,7 +5,7 @@ QtcAutotest {
Depends { name: "QmlJS" }
files: [ "tst_testtrie.h", "tst_testtrie.cpp" ]
cpp.defines: base.concat([
'QMLJS_BUILD_DIR',
'QMLJS_LIBRARY',
'QTCREATORDIR="' + project.ide_source_tree + '"',
'TESTSRCDIR="' + path + '"'
])
......
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