diff --git a/config.pri b/config.pri index e7d4f6e..903b2d7 100644 --- a/config.pri +++ b/config.pri @@ -36,9 +36,24 @@ CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private CHART_BUILD_LIB_DIR = $$SHADOW/lib CHART_BUILD_DIR = $$SHADOW/build CHART_BUILD_BIN_DIR = $$SHADOW/bin -CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart +CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR +CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR CHART_BUILD_DOC_DIR = $$SHADOW/doc +CONFIG(release,debug|release){ + CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/release + CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/release + CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/release/QtCommercial/Chart + CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR +} + + +CONFIG(debug,debug|release){ + CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/debug + CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/debug + CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/debug/QtCommercial/Chart + CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR +} # Use own folders for debug and release builds CONFIG(debug, debug|release):CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/debug) @@ -50,7 +65,8 @@ win32:{ CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\") CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\") CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\") - CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\") + CHART_BUILD_QML_PLUGIN_DIR = $$replace(CHART_BUILD_QML_PLUGIN_DIR, "/","\\") + CHART_BUILD_DESIGNER_PLUGIN_DIR = $$replace(CHART_BUILD_DESIGNER_PLUGIN_DIR, "/","\\") CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\") CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\") } diff --git a/plugins/declarative/declarative.pro b/plugins/declarative/declarative.pro index fffc56e..68fd278 100644 --- a/plugins/declarative/declarative.pro +++ b/plugins/declarative/declarative.pro @@ -1,9 +1,10 @@ -TARGET = qtcommercialchartqml -QT += declarative - !include( ../plugins.pri ) { error( "Couldn't find the plugins.pri file!" ) } + +TARGET = qtcommercialchartqml +QT += declarative +DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR CONFIG(debug, debug|release) { @@ -46,4 +47,4 @@ INSTALLS += target qmldir FILE = $$PWD/qmldir win32:{FILE = $$replace(FILE, "/","\\")} -QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR +QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_QML_PLUGIN_DIR diff --git a/plugins/designer/designer.pro b/plugins/designer/designer.pro index 972d0e5..071eee8 100644 --- a/plugins/designer/designer.pro +++ b/plugins/designer/designer.pro @@ -1,9 +1,9 @@ -TARGET=qtcommercialchartdesigner - !include( ../plugins.pri ) { error( "Couldn't find the plugins.pri file!" ) } +TARGET=qtcommercialchartdesigner +DESTDIR = $$CHART_BUILD_DESIGNER_PLUGIN_DIR CONFIG += designer HEADERS = qchartsplugin.h SOURCES = qchartsplugin.cpp diff --git a/plugins/plugins.pri b/plugins/plugins.pri index 3124550..68c62d1 100644 --- a/plugins/plugins.pri +++ b/plugins/plugins.pri @@ -5,8 +5,6 @@ TEMPLATE = lib CONFIG+= plugin - -DESTDIR = $$CHART_BUILD_PLUGIN_DIR OBJECTS_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET MOC_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET UI_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET