##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Move qmlplugins to plugins/declarative
Michal Klocek -
r1197:9dfce0b917b8
parent child
Show More
Side by Side Unified
Context file:
r1197:9dfce0b917b8 Loading diff...:
Show file before | Show file after | Hide comments
@@ -0,0 +1,13
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
3 }
4
5 TEMPLATE = lib
6
7 CONFIG+= plugin
8
9 DESTDIR = $$CHART_BUILD_BIN_DIR
10 OBJECTS_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET
11 MOC_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET
12 UI_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET
13 RCC_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET
Show file before | Show file after | Hide comments
@@ -0,0 +1,7
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
3 }
4
5 TEMPLATE = subdirs
6 SUBDIRS += \
7 declarative No newline at end of file
Show file before | Show file after | Hide comments
@@ -3,7 +3,7
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS = src qmlplugin examples demos test
6 SUBDIRS = src plugins examples demos test
7
7
8 development_build: message('Development build')
8 development_build: message('Development build')
9
9
Show file before | Show file after | Hide comments
@@ -1,23 +1,17
1 TEMPLATE = lib
2 TARGET = qtcommercialchartqml
1 TARGET = qtcommercialchartqml
3 CONFIG += qt plugin
4 QT += declarative
2 QT += declarative
5
3
6 !include( ../config.pri ) {
4 !include( ../plugins.pri ) {
7 error( "Couldn't find the config.pri file!" )
5 error( "Couldn't find the plugins.pri file!" )
8 }
6 }
9
7
10 DESTDIR = $$CHART_BUILD_PLUGIN_DIR
8 DESTDIR = $$CHART_BUILD_PLUGIN_DIR
9
11 contains(QT_MAJOR_VERSION, 5) {
10 contains(QT_MAJOR_VERSION, 5) {
12 # TODO: QtQuick2 not supported by the implementation currently
11 # TODO: QtQuick2 not supported by the implementation currently
13 DEFINES += QTQUICK2
12 DEFINES += QTQUICK2
14 }
13 }
15
14
16 OBJECTS_DIR = $$CHART_BUILD_DIR/plugin
17 MOC_DIR = $$CHART_BUILD_DIR/plugin
18 UI_DIR = $$CHART_BUILD_DIR/plugin
19 RCC_DIR = $$CHART_BUILD_DIR/plugin
20
21 SOURCES += \
15 SOURCES += \
22 plugin.cpp \
16 plugin.cpp \
23 declarativechart.cpp \
17 declarativechart.cpp \
@@ -30,6 +24,7 SOURCES += \
30 declarativepieseries.cpp \
24 declarativepieseries.cpp \
31 declarativebarseries.cpp \
25 declarativebarseries.cpp \
32 declarativemodel.cpp
26 declarativemodel.cpp
27
33 HEADERS += \
28 HEADERS += \
34 declarativechart.h \
29 declarativechart.h \
35 declarativexypoint.h \
30 declarativexypoint.h \
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativeareaseries.cpp to plugins/declarative/declarativeareaseries.cpp
NO CONTENT: file renamed from qmlplugin/declarativeareaseries.cpp to plugins/declarative/declarativeareaseries.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativeareaseries.h to plugins/declarative/declarativeareaseries.h
NO CONTENT: file renamed from qmlplugin/declarativeareaseries.h to plugins/declarative/declarativeareaseries.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativebarseries.cpp to plugins/declarative/declarativebarseries.cpp
NO CONTENT: file renamed from qmlplugin/declarativebarseries.cpp to plugins/declarative/declarativebarseries.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativebarseries.h to plugins/declarative/declarativebarseries.h
NO CONTENT: file renamed from qmlplugin/declarativebarseries.h to plugins/declarative/declarativebarseries.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativechart.cpp to plugins/declarative/declarativechart.cpp
NO CONTENT: file renamed from qmlplugin/declarativechart.cpp to plugins/declarative/declarativechart.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativechart.h to plugins/declarative/declarativechart.h
NO CONTENT: file renamed from qmlplugin/declarativechart.h to plugins/declarative/declarativechart.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativelineseries.cpp to plugins/declarative/declarativelineseries.cpp
NO CONTENT: file renamed from qmlplugin/declarativelineseries.cpp to plugins/declarative/declarativelineseries.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativelineseries.h to plugins/declarative/declarativelineseries.h
NO CONTENT: file renamed from qmlplugin/declarativelineseries.h to plugins/declarative/declarativelineseries.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativemodel.cpp to plugins/declarative/declarativemodel.cpp
NO CONTENT: file renamed from qmlplugin/declarativemodel.cpp to plugins/declarative/declarativemodel.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativemodel.h to plugins/declarative/declarativemodel.h
NO CONTENT: file renamed from qmlplugin/declarativemodel.h to plugins/declarative/declarativemodel.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativepieseries.cpp to plugins/declarative/declarativepieseries.cpp
NO CONTENT: file renamed from qmlplugin/declarativepieseries.cpp to plugins/declarative/declarativepieseries.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativepieseries.h to plugins/declarative/declarativepieseries.h
NO CONTENT: file renamed from qmlplugin/declarativepieseries.h to plugins/declarative/declarativepieseries.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativescatterseries.cpp to plugins/declarative/declarativescatterseries.cpp
NO CONTENT: file renamed from qmlplugin/declarativescatterseries.cpp to plugins/declarative/declarativescatterseries.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativescatterseries.h to plugins/declarative/declarativescatterseries.h
NO CONTENT: file renamed from qmlplugin/declarativescatterseries.h to plugins/declarative/declarativescatterseries.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativesplineseries.cpp to plugins/declarative/declarativesplineseries.cpp
NO CONTENT: file renamed from qmlplugin/declarativesplineseries.cpp to plugins/declarative/declarativesplineseries.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativesplineseries.h to plugins/declarative/declarativesplineseries.h
NO CONTENT: file renamed from qmlplugin/declarativesplineseries.h to plugins/declarative/declarativesplineseries.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativexypoint.cpp to plugins/declarative/declarativexypoint.cpp
NO CONTENT: file renamed from qmlplugin/declarativexypoint.cpp to plugins/declarative/declarativexypoint.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativexypoint.h to plugins/declarative/declarativexypoint.h
NO CONTENT: file renamed from qmlplugin/declarativexypoint.h to plugins/declarative/declarativexypoint.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativexyseries.cpp to plugins/declarative/declarativexyseries.cpp
NO CONTENT: file renamed from qmlplugin/declarativexyseries.cpp to plugins/declarative/declarativexyseries.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/declarativexyseries.h to plugins/declarative/declarativexyseries.h
NO CONTENT: file renamed from qmlplugin/declarativexyseries.h to plugins/declarative/declarativexyseries.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/plugin.cpp to plugins/declarative/plugin.cpp
NO CONTENT: file renamed from qmlplugin/plugin.cpp to plugins/declarative/plugin.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from qmlplugin/qmldir to plugins/declarative/qmldir
NO CONTENT: file renamed from qmlplugin/qmldir to plugins/declarative/qmldir
General Comments 0
You need to be logged in to leave comments. Login now