diff --git a/charts.pro b/charts.pro index c826039..97c8ac8 100644 --- a/charts.pro +++ b/charts.pro @@ -5,6 +5,8 @@ TEMPLATE = subdirs SUBDIRS = src qmlplugin examples demos test +development_build: message('Development build') + local_build:{ message('Configured for local build against local libs...') message('You can run "make" to build qchart library, examples and demos...') diff --git a/config.pri b/config.pri index 3a68838..5501c8d 100644 --- a/config.pri +++ b/config.pri @@ -10,9 +10,9 @@ temp = $$first(temp) path = "$${path}$${temp}" SHADOW=$$path - CONFIG-=developer_build }else{ SHADOW=$$PWD + CONFIG-=development_build } CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include @@ -44,4 +44,7 @@ mac: { QMAKE_LFLAGS *= -mmacosx-version-min=10.5 } -developer_build: DEFINES+=DEVELOPER_BUILD \ No newline at end of file +development_build: { + DEFINES+=DEVELOPMENT_BUILD + CONFIG+=local_build +} \ No newline at end of file diff --git a/src/chartconfig_p.h b/src/chartconfig_p.h index 5545864..6acccf3 100644 --- a/src/chartconfig_p.h +++ b/src/chartconfig_p.h @@ -27,10 +27,10 @@ // There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly. // This is the case at least with shadow builds. // http://qt-project.org/wiki/jom -#undef DEVELOPER_BUILD +#undef DEVELOPMENT_BUILD #endif -#ifndef DEVELOPER_BUILD +#ifndef DEVELOPMENT_BUILD const char *buildTime = __TIME__" "__DATE__; const char *gitHead = "unknown"; #else diff --git a/src/qchartglobal.h b/src/qchartglobal.h index ad6fb3a..7c5524b 100644 --- a/src/qchartglobal.h +++ b/src/qchartglobal.h @@ -42,7 +42,7 @@ # define QTCOMMERCIALCHART_USE_NAMESPACE #endif -#if defined(DEVELOPER_BUILD) && !defined(QT_NO_DEBUG) +#if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG) #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__) diff --git a/src/src.pro b/src/src.pro index f75963c..9f470b2 100644 --- a/src/src.pro +++ b/src/src.pro @@ -126,7 +126,7 @@ QMAKE_EXTRA_COMPILERS += install_build_public_headers \ # This is the case at least with shadow builds. # http://qt-project.org/wiki/jom -developer_build:!win32-msvc*:{ +development_build:!win32-msvc*:{ chartversion.target = $$PWD/qchartversion_p.h unix:{