##// END OF EJS Templates
Merge remote-tracking branch 'origin/5.6' into 5.7...
Merge remote-tracking branch 'origin/5.6' into 5.7 Conflicts: src/charts/doc/qtcharts.qdocconf Change-Id: If6160b2f643e7df8c32400b97afac229b95b78de

File last commit:

r2861:21c113d296ef
r2893:0464d42b101e merge 5.7.0
Show More
axis.pri
108 lines | 3.6 KiB | text/plain | TextLexer
sauimone
modified .pri files to show treeview in qt creator
r1710 #Subdirectiores are defined here, because qt creator doesn't handle nested include(foo.pri) chains very well.
Michal Klocek
Refactors Domain and Axis...
r1698
sauimone
modified .pri files to show treeview in qt creator
r1710 INCLUDEPATH += $$PWD \
Marek Rosa
renamed QValueAxis related files
r1805 $$PWD/valueaxis \
Marek Rosa
renamed QBarCategoryAxis related files
r1810 $$PWD/barcategoryaxis \
Marek Rosa
QLogValueAxis added. Log domain missing
r2274 $$PWD/categoryaxis \
$$PWD/logvalueaxis
sauimone
modified .pri files to show treeview in qt creator
r1710
DEPENDPATH += $$PWD \
Marek Rosa
renamed QValueAxis related files
r1805 $$PWD/valueaxis \
Marek Rosa
renamed QBarCategoryAxis related files
r1810 $$PWD/barcategoryaxis \
Marek Rosa
QLogValueAxis added. Log domain missing
r2274 $$PWD/categoryaxis \
$$PWD/logvalueaxis
Michal Klocek
Move axes files to subdir
r478
SOURCES += \
Miikka Heikkinen
Add Polar chart support...
r2483 $$PWD/chartaxiselement.cpp \
$$PWD/cartesianchartaxis.cpp \
sauimone
modified .pri files to show treeview in qt creator
r1710 $$PWD/qabstractaxis.cpp \
Michal Klocek
Refactors axis updateGeometry handling...
r2111 $$PWD/verticalaxis.cpp \
$$PWD/horizontalaxis.cpp \
Marek Rosa
renamed QValueAxis related files
r1805 $$PWD/valueaxis/chartvalueaxisx.cpp \
$$PWD/valueaxis/chartvalueaxisy.cpp \
$$PWD/valueaxis/qvalueaxis.cpp \
Marek Rosa
renamed QBarCategoryAxis related files
r1810 $$PWD/barcategoryaxis/chartbarcategoryaxisx.cpp \
$$PWD/barcategoryaxis/chartbarcategoryaxisy.cpp \
$$PWD/barcategoryaxis/qbarcategoryaxis.cpp \
Marek Rosa
Renamed QCategoryAxis related files
r1817 $$PWD/categoryaxis/chartcategoryaxisx.cpp \
$$PWD/categoryaxis/chartcategoryaxisy.cpp \
Marek Rosa
QLogValueAxis added. Log domain missing
r2274 $$PWD/categoryaxis/qcategoryaxis.cpp \
$$PWD/logvalueaxis/chartlogvalueaxisx.cpp \
$$PWD/logvalueaxis/chartlogvalueaxisy.cpp \
$$PWD/logvalueaxis/qlogvalueaxis.cpp
sauimone
modified .pri files to show treeview in qt creator
r1710
Michal Klocek
Move axes files to subdir
r478 PRIVATE_HEADERS += \
Miikka Heikkinen
Add Polar chart support...
r2483 $$PWD/chartaxiselement_p.h \
$$PWD/cartesianchartaxis_p.h \
sauimone
modified .pri files to show treeview in qt creator
r1710 $$PWD/qabstractaxis_p.h \
Michal Klocek
Refactors axis updateGeometry handling...
r2111 $$PWD/verticalaxis_p.h \
$$PWD/horizontalaxis_p.h \
Miikka Heikkinen
Add Polar chart support...
r2483 $$PWD/linearrowitem_p.h \
Marek Rosa
renamed QValueAxis related files
r1805 $$PWD/valueaxis/chartvalueaxisx_p.h \
$$PWD/valueaxis/chartvalueaxisy_p.h \
$$PWD/valueaxis/qvalueaxis_p.h \
Marek Rosa
renamed QBarCategoryAxis related files
r1810 $$PWD/barcategoryaxis/chartbarcategoryaxisx_p.h \
$$PWD/barcategoryaxis/chartbarcategoryaxisy_p.h \
$$PWD/barcategoryaxis/qbarcategoryaxis_p.h \
Marek Rosa
Renamed QCategoryAxis related files
r1817 $$PWD/categoryaxis/chartcategoryaxisx_p.h \
$$PWD/categoryaxis/chartcategoryaxisy_p.h \
Marek Rosa
QLogValueAxis added. Log domain missing
r2274 $$PWD/categoryaxis/qcategoryaxis_p.h \
$$PWD/logvalueaxis/chartlogvalueaxisx_p.h \
$$PWD/logvalueaxis/chartlogvalueaxisy_p.h \
$$PWD/logvalueaxis/qlogvalueaxis_p.h
Michal Klocek
Move axes files to subdir
r478
Marek Rosa
Added Chart classes for value and categories axis
r1555 PUBLIC_HEADERS += \
sauimone
modified .pri files to show treeview in qt creator
r1710 $$PWD/qabstractaxis.h \
Marek Rosa
renamed QValueAxis related files
r1805 $$PWD/valueaxis/qvalueaxis.h \
Marek Rosa
renamed QBarCategoryAxis related files
r1810 $$PWD/barcategoryaxis/qbarcategoryaxis.h \
Marek Rosa
QLogValueAxis added. Log domain missing
r2274 $$PWD/categoryaxis/qcategoryaxis.h \
$$PWD/logvalueaxis/qlogvalueaxis.h \
Marek Rosa
Disabled QDateTimeAxis on ARM
r1867
Miikka Heikkinen
Add Polar chart support...
r2483 # polar
SOURCES += \
$$PWD/polarchartaxis.cpp \
$$PWD/polarchartaxisangular.cpp \
$$PWD/polarchartaxisradial.cpp \
$$PWD/valueaxis/polarchartvalueaxisangular.cpp \
$$PWD/valueaxis/polarchartvalueaxisradial.cpp \
$$PWD/logvalueaxis/polarchartlogvalueaxisangular.cpp \
$$PWD/logvalueaxis/polarchartlogvalueaxisradial.cpp \
$$PWD/categoryaxis/polarchartcategoryaxisangular.cpp \
$$PWD/categoryaxis/polarchartcategoryaxisradial.cpp
PRIVATE_HEADERS += \
$$PWD/polarchartaxis_p.h \
$$PWD/polarchartaxisangular_p.h \
$$PWD/polarchartaxisradial_p.h \
$$PWD/valueaxis/polarchartvalueaxisangular_p.h \
$$PWD/valueaxis/polarchartvalueaxisradial_p.h \
$$PWD/logvalueaxis/polarchartlogvalueaxisangular_p.h \
$$PWD/logvalueaxis/polarchartlogvalueaxisradial_p.h \
$$PWD/categoryaxis/polarchartcategoryaxisangular_p.h \
$$PWD/categoryaxis/polarchartcategoryaxisradial_p.h
Miikka Heikkinen
No longer automatically disable QDateTimeAxis on ARM platforms...
r2861 !contains(QT_COORD_TYPE, float): {
Marek Rosa
Disabled QDateTimeAxis on ARM
r1867 INCLUDEPATH += \
$$PWD/datetimeaxis
DEPENDPATH += \
$$PWD/datetimeaxis
SOURCES += \
$$PWD/datetimeaxis/chartdatetimeaxisx.cpp \
$$PWD/datetimeaxis/chartdatetimeaxisy.cpp \
Miikka Heikkinen
Add Polar chart support...
r2483 $$PWD/datetimeaxis/qdatetimeaxis.cpp \
$$PWD/datetimeaxis/polarchartdatetimeaxisangular.cpp \
$$PWD/datetimeaxis/polarchartdatetimeaxisradial.cpp
Marek Rosa
Disabled QDateTimeAxis on ARM
r1867
PRIVATE_HEADERS += \
$$PWD/datetimeaxis/chartdatetimeaxisx_p.h \
$$PWD/datetimeaxis/chartdatetimeaxisy_p.h \
Miikka Heikkinen
Add Polar chart support...
r2483 $$PWD/datetimeaxis/qdatetimeaxis_p.h \
$$PWD/datetimeaxis/polarchartdatetimeaxisangular_p.h \
$$PWD/datetimeaxis/polarchartdatetimeaxisradial_p.h
Marek Rosa
Disabled QDateTimeAxis on ARM
r1867
PUBLIC_HEADERS += \
Marek Rosa
Added QDateTimeAxis
r1717 $$PWD/datetimeaxis/qdatetimeaxis.h
Marek Rosa
Disabled QDateTimeAxis on ARM
r1867 }
Marek Rosa
QLogValueAxis added. Log domain missing
r2274