HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r2853:a801e78fb8d1

1

2

TARGET = qtchartsqml2

2

TARGET = qtchartsqml2

3

QT += qml quick

3

QT += qml quick

4

QT += charts charts-private

4

QT += charts charts-private

5

TARGETPATH = QtCharts

5

TARGETPATH = QtCharts

6

7

IMPORT_VERSION = $$MODULE_VERSION

7

IMPORT_VERSION = $$MODULE_VERSION

8

9

# Only build qml plugin static if Qt itself is also built static

9

# Only build qml plugin static if Qt itself is also built static

10

!contains(QT_CONFIG, static): CONFIG -= static staticlib

10

!contains(QT_CONFIG, static): CONFIG -= static staticlib

11

12

include($$PWD/designer/designer.pri)

12

include($$PWD/designer/designer.pri)

13

14

INCLUDEPATH += ../../include \

14

INCLUDEPATH += ../../include \

15

../../include/QtCharts \

15

../../include/QtCharts \

16

../charts \

16

../charts \

17

../charts/animations \

17

../charts/animations \

18

../charts/axis \

18

../charts/axis \

19

../charts/domain

19

../charts/domain

20

21

SOURCES += \

21

SOURCES += \

22

chartsqml2_plugin.cpp \

22

chartsqml2_plugin.cpp \

23

declarativechart.cpp \

23

declarativechart.cpp \

24

declarativexypoint.cpp \

24

declarativexypoint.cpp \

25

declarativexyseries.cpp \

25

declarativexyseries.cpp \

26

declarativelineseries.cpp \

26

declarativelineseries.cpp \

27

declarativesplineseries.cpp \

27

declarativesplineseries.cpp \

28

declarativeareaseries.cpp \

28

declarativeareaseries.cpp \

29

declarativescatterseries.cpp \

29

declarativescatterseries.cpp \

30

declarativepieseries.cpp \

30

declarativepieseries.cpp \

31

declarativebarseries.cpp \

31

declarativebarseries.cpp \

32

declarativecategoryaxis.cpp \

32

declarativecategoryaxis.cpp \

33

declarativemargins.cpp \

33

declarativemargins.cpp \

34

declarativeaxes.cpp \

34

declarativeaxes.cpp \

35

declarativepolarchart.cpp \

35

declarativepolarchart.cpp \

36

declarativeboxplotseries.cpp \

36

declarativeboxplotseries.cpp \

37

declarativechartnode.cpp \

37

declarativechartnode.cpp \

38

declarativerendernode.cpp

38

declarativerendernode.cpp

39

40

HEADERS += \

40

HEADERS += \

41

declarativechart.h \

41

declarativechart.h \

42

declarativexypoint.h \

42

declarativexypoint.h \

43

declarativexyseries.h \

43

declarativexyseries.h \

44

declarativelineseries.h \

44

declarativelineseries.h \

45

declarativesplineseries.h \

45

declarativesplineseries.h \

46

declarativeareaseries.h \

46

declarativeareaseries.h \

47

declarativescatterseries.h \

47

declarativescatterseries.h \

48

declarativepieseries.h \

48

declarativepieseries.h \

49

declarativebarseries.h \

49

declarativebarseries.h \

50

declarativecategoryaxis.h \

50

declarativecategoryaxis.h \

51

declarativemargins.h \

51

declarativemargins.h \

52

declarativeaxes.h \

52

declarativeaxes.h \

53

declarativepolarchart.h \

53

declarativepolarchart.h \

54

declarativeboxplotseries.h \

54

declarativeboxplotseries.h \

55

declarativechartnode.h \

55

declarativechartnode.h \

56

declarativerendernode.h

56

declarativerendernode.h

57

58

OTHER_FILES = qmldir

58

OTHER_FILES = qmldir

59

60

CONFIG += no_cxx_module

60

CONFIG += no_cxx_module

61

62

load(qml_plugin)

62

load(qml_plugin)

63

64

win32 {

64

win32 {

65

CONFIG += skip_target_version_ext

65

CONFIG += skip_target_version_ext

66

VERSION = $$MODULE_VERSION

66

VERSION = $$MODULE_VERSION

67

QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"

67

QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"

68

QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."

68

QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."

69

}

69

}

70

71

# Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples

72

# without having to do 'make install'.

73

!android:!ios {

74

copy_qmldir.target = $$DESTDIR/qmldir

75

copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir

76

copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"

77

QMAKE_EXTRA_TARGETS += copy_qmldir

78

PRE_TARGETDEPS += $$copy_qmldir.target

79

}

80

81

QML_FILES += \

71

QML_FILES += \

82

$$PWD/plugins.qmltypes

72

$$PWD/plugins.qmltypes

	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

             TARGET = qtchartsqml2
             QT += qml quick
             QT += charts charts-private
             TARGETPATH = QtCharts
             IMPORT_VERSION = $$MODULE_VERSION
             # Only build qml plugin static if Qt itself is also built static
             !contains(QT_CONFIG, static): CONFIG -= static staticlib
             include($$PWD/designer/designer.pri)
             INCLUDEPATH += ../../include \
                            ../../include/QtCharts \
                            ../charts \
                            ../charts/animations \
                            ../charts/axis \
                            ../charts/domain
             SOURCES += \
                 chartsqml2_plugin.cpp \
                 declarativechart.cpp \
                 declarativexypoint.cpp \
                 declarativexyseries.cpp \
                 declarativelineseries.cpp \
                 declarativesplineseries.cpp \
                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp \
                 declarativecategoryaxis.cpp \
                 declarativemargins.cpp \
                 declarativeaxes.cpp \
                 declarativepolarchart.cpp \
                 declarativeboxplotseries.cpp \
                 declarativechartnode.cpp \
                 declarativerendernode.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativexypoint.h \
                 declarativexyseries.h \
                 declarativelineseries.h \
                 declarativesplineseries.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h \
                 declarativecategoryaxis.h \
                 declarativemargins.h \
                 declarativeaxes.h \
                 declarativepolarchart.h \
                 declarativeboxplotseries.h \
                 declarativechartnode.h \
                 declarativerendernode.h
             OTHER_FILES = qmldir
             CONFIG += no_cxx_module
             load(qml_plugin)
             win32 {
                 CONFIG += skip_target_version_ext
                 VERSION = $$MODULE_VERSION
                 QMAKE_TARGET_PRODUCT = "Qt Charts (Qt $$QT_VERSION)"
                 QMAKE_TARGET_DESCRIPTION = "Charts QML plugin for Qt."
             }
-            # Copy qmldir to DESTDIR so we can use the plugin directly from there in our examples
-            # without having to do 'make install'.
-            !android:!ios {
-                copy_qmldir.target = $$DESTDIR/qmldir
-                copy_qmldir.depends = $$_PRO_FILE_PWD_/qmldir
-                copy_qmldir.commands = $(COPY_FILE) \"$$replace(copy_qmldir.depends, /, $$QMAKE_DIR_SEP)\" \"$$replace(copy_qmldir.target, /, $$QMAKE_DIR_SEP)\"
-                QMAKE_EXTRA_TARGETS += copy_qmldir
-                PRE_TARGETDEPS += $$copy_qmldir.target
             QML_FILES += \
                 $$PWD/plugins.qmltypes