##// 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/charts.pro src/charts/qchartglobal.h src/chartsqml2/chartsqml2.pro tests/auto/chartdataset/tst_chartdataset.cpp tests/auto/domain/tst_domain.cpp Change-Id: I9bfc63f6e93f9a3b86e53aca218dd3a48bb2ffc1

File last commit:

r2860:a32ee2946028
r2898:03a6177a3223 merge master
Show More
sync.profile
18 lines | 620 B | text/plain | TextLexer
%modules = ( # path to module name map
"QtCharts" => "$basedir/src/charts",
);
%moduleheaders = ( # restrict the module headers to those found in relative path
);
%classnames = (
"qchartglobal.h" => "QChartGlobal"
);
# Module dependencies.
# Every module that is required to build this module should have one entry.
# Each of the module version specifiers can take one of the following values:
# - A specific Git revision.
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
"qtbase" => "",
"qtdeclarative" => "",
);