##// 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: .qmake.conf README src/charts/qchartglobal.h Change-Id: I20497b20947f589f9f73239a09ba6ea013b3597a

File last commit:

r2828:7557d1ea51b5
r2878:97bb01ce5d85 merge
Show More
chartwidgettest.pro
15 lines | 243 B | text/idl | PrologLexer
!include( ../../tests.pri ) {
error( "Couldn't find the test.pri file!" )
}
TEMPLATE = app
QT += core gui widgets
SOURCES += main.cpp \
mainwidget.cpp \
dataseriedialog.cpp
HEADERS += \
mainwidget.h \
dataseriedialog.h