##// END OF EJS Templates
New attempt to enable building of qml-qtquicktest on OSX
Tero Ahola -
r2215:805cd6f3e586
parent child
Show More
@@ -1,49 +1,53
1 !include( ../tests.pri ) {
1 !include( ../tests.pri ) {
2 error( "Couldn't find the tests.pri file!" )
2 error( "Couldn't find the tests.pri file!" )
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS += \
6 SUBDIRS += \
7 qchartview \
7 qchartview \
8 qchart \
8 qchart \
9 qlineseries \
9 qlineseries \
10 qbarset \
10 qbarset \
11 qbarseries \
11 qbarseries \
12 qstackedbarseries \
12 qstackedbarseries \
13 qpercentbarseries \
13 qpercentbarseries \
14 qpieslice qpieseries \
14 qpieslice qpieseries \
15 qpiemodelmapper \
15 qpiemodelmapper \
16 qsplineseries \
16 qsplineseries \
17 qscatterseries \
17 qscatterseries \
18 qxymodelmapper \
18 qxymodelmapper \
19 qbarmodelmapper \
19 qbarmodelmapper \
20 qhorizontalbarseries \
20 qhorizontalbarseries \
21 qhorizontalstackedbarseries \
21 qhorizontalstackedbarseries \
22 qhorizontalpercentbarseries \
22 qhorizontalpercentbarseries \
23 qvalueaxis \
23 qvalueaxis \
24 qcategoryaxis \
24 qcategoryaxis \
25 qbarcategoryaxis \
25 qbarcategoryaxis \
26 domain \
26 domain \
27 chartdataset \
27 chartdataset \
28 qlegend
28 qlegend
29
29
30 contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) {
30 contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) {
31 warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.")
31 warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.")
32 } else {
32 } else {
33 SUBDIRS += qml
33 SUBDIRS += qml
34
34
35 # Check if QtQuickTest is installed
35 # Check if QtQuickTest is installed
36 exists($$(QTDIR)/lib/QtQuickTest.lib) {
36 exists($$(QTDIR)/lib/QtQuickTest.lib) {
37 SUBDIRS += qml-qtquicktest
37 SUBDIRS += qml-qtquicktest
38 } else {
38 } else {
39 warning("QtQuickTest not found; cannot build QML api unit tests")
39 exists($$(QTDIR)/lib/libQtQuickTest.dylib) {
40 SUBDIRS += qml-qtquicktest
41 } else {
42 warning("QtQuickTest not found; cannot build QML api unit tests")
43 }
40 }
44 }
41 }
45 }
42
46
43 !linux-arm*: {
47 !linux-arm*: {
44 SUBDIRS += \
48 SUBDIRS += \
45 qdatetimeaxis
49 qdatetimeaxis
46 }
50 }
47
51
48
52
49
53
General Comments 0
You need to be logged in to leave comments. Login now