HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r996:ce5f1c868418

0

build.pri ~~integrated.pri~~ renamed +1 -1

-            integrated_build:{
+            local_build:{
                 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
                 !win32: {

0

charts.pro +11 -6

-            !include(common.pri) {
+            !include(config.pri) {
-                error('missing common.pri')
+                error('Missing config.pri')
             }
             TEMPLATE = subdirs
-            SUBDIRS += src qmlplugin examples demos test
+            SUBDIRS = src qmlplugin examples demos test
-            integrated_build:{
+            local_build:{
-                message('Configured for integrated build against local libs...')
+                message('Configured for local build against local libs...')
+                message('You can run "make" to build qchart library, examples and demos...')
             } else {
                 message('Running build aginst system libs...')
-                message('Please build example test and qmlplugin after installing library.')
+                message('Bulding only charts library...')
+                message('You can run "make install" to build and install charts.')
+                message('Afterwards you can run "cd examples; qmake ; make " to build examples.')
+                message('Run qmake CONFIG+=local_build' to build everything at once.)
+                SUBDIRS = src
             }
             CONFIG += ordered

0

config.pri ~~common.pri~~ renamed +4 -1

-            CONFIG+=integrated_build #remove if you want to build against installed libs
+            #check if shadow build
             !contains($${PWD}, $${OUT_PWD}){
                 search = "$$PWD:::"
                 temp = $$split(search,"/")
                 temp = $$first(temp)
                 path = "$${path}$${temp}"
                 SHADOW=$$path
+                CONFIG-=developer_build
             }else{
                 SHADOW=$$PWD
             }
                 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
                 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
             }
+            developer_build: DEFINES+=DEVELOPER_BUILD
  No newline at end of file

0

demos/demos.pri +4 -4

-            !include( ../common.pri ) {
+            !include( ../config.pri ) {
-             error( "Couldn't find the common.pri file!" )
+             error( "Couldn't find the config.pri file!" )
             }
-            !include( ../integrated.pri ) {
+            !include( ../build.pri ) {
-             error( "Couldn't find the integrated.pri file !")
+             error( "Couldn't find the build.pri file !")
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR

0

examples/examples.pri +4 -4

-            !include( ../common.pri ) {
+            !include( ../config.pri ) {
-             error( "Couldn't find the common.pri file!" )
+             error( "Couldn't find the config.pri file!" )
             }
-            !include( ../integrated.pri ) {
+            !include( ../build.pri ) {
-             error( "Couldn't find the integrated.pri file !")
+             error( "Couldn't find the build.pri file !")
             }
             DESTDIR = $$CHART_BUILD_BIN_DIR

0

qmlplugin/declarativexypoint.h +1 0

             #include "qchartglobal.h"
             #include <QObject>
             #include <QPointF>
+            #include <QTextStream>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

qmlplugin/qmlplugin.pro +3 -3

             CONFIG += qt plugin
             QT += declarative
-            !include( ../common.pri ) {
+            !include( ../config.pri ) {
                 error( "Couldn't find the common.pri file!" )
             }
-            !include( ../integrated.pri ) {
+            !include( ../build.pri ) {
-                error( "Couldn't find the integrated.pri file !")
+                error( "Couldn't find the build.pri file !")
             }
             DESTDIR = $$CHART_BUILD_PLUGIN_DIR

0

src/animations/splineanimation.cpp +1 0

             #include "splineanimation_p.h"
             #include "splinechartitem_p.h"
+            #include <QDebug>
             Q_DECLARE_METATYPE(QVector<QPointF>)
             Q_DECLARE_METATYPE(SplineVector)

0

src/animations/xyanimation.cpp +1 0

             #include "xyanimation_p.h"
             #include "xychartitem_p.h"
+            #include <QDebug>
             Q_DECLARE_METATYPE(QVector<QPointF>)

0

src/axis/axis.cpp +2 -1

             #include "chartpresenter_p.h"
             #include "chartanimator_p.h"
             #include <QPainter>
+            #include <QDebug>
             #include <cmath>
             static int label_padding = 5;
             		}
             		break;
             		default:
-                    qDebug()<<"Unknown axis type";
+            		    qWarning()<<"Unknown axis type";
             		break;
             	}

0

src/axis/qchartaxiscategories_p.h +1 0

             #define QCHARTAXISCATEGORIES_P_H
             #include "qchartaxiscategories.h"
+            #include <QMap>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/barchart/qbarset_p.h +1 0

             #define QBARSET_P_H
             #include "qbarset.h"
+            #include <QMap>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/chart.cpp +1 0

             #include "chart_p.h"
             #include "chartpresenter_p.h"
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/chart_p.h +1 0

             #define CHART_H
             #include "qchartglobal.h"
+            #include <QObject>
             #include <QRect>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/chartconfig_p.h +7 -3

             #define CHARTCONFIG_H
             #include "qchartglobal.h"
             #ifdef Q_CC_MSVC
             // 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
-            const char *buildTime = __DATE__;
+            #undef DEVELOPER_BUILD
+            #endif
+            #ifndef DEVELOPER_BUILD
+            const char *buildTime =  __TIME__" "__DATE__;
             const char *gitHead = "unknown";
             #else
             #include "qchartversion_p.h"
             #endif
             QTCOMMERCIALCHART_BEGIN_NAMESPACE
             class ChartConfig {
             private:
                 ChartConfig(){
-                #ifndef QT_NO_DEBUG
+                #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG)
                     qDebug()<<"buildTime" << buildTime;
                     qDebug()<<"gitHead" << gitHead;
                 #endif

0

src/domain_p.h +1 0

             #include "qchartglobal.h"
             #include <QRectF>
             #include <QSizeF>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/piechart/piechartitem.cpp 0 -1

             #include "chartpresenter_p.h"
             #include "chartdataset_p.h"
             #include "chartanimator_p.h"
-            #include <QDebug>
             #include <QPainter>
             #include <QTimer>

0

src/piechart/pieslicedata_p.h 0 -1

             #include "qpieslice.h"
             #include <QPen>
             #include <QBrush>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/piechart/piesliceitem.cpp 0 -1

             #include "qpieslice.h"
             #include "chartpresenter_p.h"
             #include <QPainter>
-            #include <QDebug>
             #include <qmath.h>
             #include <QGraphicsSceneEvent>
             #include <QTime>

0

src/piechart/qpieseries.cpp 0 -1

             #include "chartanimator_p.h"
             #include "legendmarker_p.h"
             #include <QAbstractItemModel>
-            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/qchartglobal.h +5 -4

             # define QTCOMMERCIALCHART_USE_NAMESPACE
             #endif
-            #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__);
+            #if defined(DEVELOPER_BUILD) && !defined(QT_NO_DEBUG)
+            #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
             #include <stdarg.h>
             #include <QDebug>
-            /*
+            static inline QDebug chartDebug(int numargs,...)
-            static QDebug chartDebug(int numargs,...)
             {
                    va_list valist;
                    va_start(valist,numargs);
                    va_end(valist);
                    return qDebug()<<QString().append(function).append("(").append(file).append(":%1)").arg(line);
             }
-            */
+            #endif
             #endif

0

src/scatterseries/scatterchartitem.cpp +1 0

             #include "chartpresenter_p.h"
             #include <QPainter>
             #include <QGraphicsScene>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/scroller.cpp +1 0

             #include "scroller_p.h"
             #include "qlegend.h"
             #include <QGraphicsSceneMouseEvent>
+            #include <QDebug>
             QTCOMMERCIALCHART_BEGIN_NAMESPACE

0

src/src.pro +9 -7

-            !include( ../common.pri ):error( Couldn't find the common.pri file! )
+            !include( ../config.pri ):error( Couldn't find the config.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }
+                PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal
                 system($$command)
             }
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers \
-            !win32-msvc*: {
             # 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
+            developer_build:!win32-msvc*:{
                 chartversion.target = $$PWD/qchartversion_p.h
                 unix:{
                     chartversion.commands = @echo \
-                        "const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" \\; \
+                        \" $${LITERAL_HASH}ifndef QCHARTVERSION_P_H\\n\
-                         const char *gitHead = \\\"`git rev-parse HEAD`\\\" \\; " \
+                        $${LITERAL_HASH}define QCHARTVERSION_P_H\\n\
+                        const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" ; \\n\
+                        const char *gitHead = \\\"`git rev-parse HEAD`\\\" ; \\n \
+                        $${LITERAL_HASH}endif \"  \
                         > \
                         $$chartversion.target;
                 }else{
                 chartversion.depends = $$HEADERS \
                     $$SOURCES
-                PRE_TARGETDEPS += $$PWD/qchartversion_p.h
+                PRE_TARGETDEPS += $$chartversion.target
                 QMAKE_CLEAN += $$PWD/qchartversion_p.h
                 QMAKE_EXTRA_TARGETS += chartversion
             }

0

test/auto/auto.pri +2 -13

@@ -1,17 +1,6
1	!include( ../~~../common~~.pri ) {	1	!include( ../test.pri ) {
2	error( "Couldn't find the ~~common~~.pri file!" )	2	error( "Couldn't find the test.pri file!" )
3	}
4	!include( ../../integrated.pri ) {
5	error( "Couldn't find the integrated.pri file !")
6	}	3	}
7		4
8	TEMPLATE = app
9	CONFIG += qtestlib	5	CONFIG += qtestlib
10
11	DESTDIR = $$CHART_BUILD_BIN_DIR/test
12	OBJECTS_DIR = $$CHART_BUILD_DIR/test/$$TARGET
13	MOC_DIR = $$CHART_BUILD_DIR/test/$$TARGET
14	UI_DIR = $$CHART_BUILD_DIR/test/$$TARGET
15	RCC_DIR = $$CHART_BUILD_DIR/test/$$TARGET
16
17	!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")	6	!contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")

0

test/gdpbarchart/widget.cpp +1 0

             #include <QRadioButton>
             #include <QStringList>
             #include <QSqlQuery>
+            #include <QDebug>
             QTCOMMERCIALCHART_USE_NAMESPACE

0

test/test.pri +4 -4

-            !include( ../common.pri ) {
+            !include( ../config.pri ) {
-                error( "Couldn't find the common.pri file!" )
+                error( "Couldn't find the config.pri file!" )
             }
-            !include( ../integrated.pri ) {
+            !include( ../build.pri ) {
-                error( "Couldn't find the integrated.pri file !")
+                error( "Couldn't find the build.pri file !")
             }
             TEMPLATE = app

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages