projects / packages / gegl-qt.git / blame
| Commit | Line | Data |
|---|---|---|
| 83d12dcb JB |
1 | --- gegl-qt-0.0.7/config.pri.orig 2014-10-15 21:31:05.125333082 +0200 |
| 2 | +++ gegl-qt-0.0.7/config.pri 2014-10-16 20:21:36.518548768 +0200 | |
| 3 | @@ -67,7 +67,7 @@ | |
| 4 | # QtDeclarative | |
| 5 | HAVE_QT_DECLARATIVE = yes | |
| 6 | contains(QT_MAJOR_VERSION, 5) { | |
| 7 | - !contains(QT_CONFIG, declarative) { | |
| 8 | + !system(pkg-config Qt5Declarative_disabled) { | |
| 9 | HAVE_QT_DECLARATIVE = no | |
| 10 | } | |
| 11 | } else { | |
| 12 | @@ -79,22 +79,16 @@ | |
| 13 | # QtQuick1 provides QDeclarativeView and QDeclarativeItem | |
| 14 | # On Qt4 it is actually a part of the QtDeclarative module | |
| 15 | HAVE_QT_QUICK1 = yes | |
| 16 | -contains(QT_MAJOR_VERSION, 5) { | |
| 17 | - !contains(QT_CONFIG, quick1) { | |
| 18 | - HAVE_QT_QUICK1 = no | |
| 19 | - } | |
| 20 | -} else { | |
| 21 | - !contains(HAVE_QT_DECLARATIVE, yes) { | |
| 22 | - HAVE_QT_QUICK1 = no | |
| 23 | - } | |
| 24 | +!contains(HAVE_QT_DECLARATIVE, yes) { | |
| 25 | + HAVE_QT_QUICK1 = no | |
| 26 | } | |
| 27 | ||
| 28 | # On Qt5, quick or quick1 is required in addition to declarative for "QT" option | |
| 29 | # On Qt4, it should only contain declarative | |
| 30 | contains(QT_MAJOR_VERSION, 5) { | |
| 31 | - QT_DECLARATIVE = declarative quick | |
| 32 | + QT_DECLARATIVE = declarative | |
| 33 | contains(HAVE_QT_QUICK1, yes) { | |
| 34 | - QT_DECLARATIVE += quick1 | |
| 35 | + QT_DECLARATIVE += quick1 | |
| 36 | } | |
| 37 | } else { | |
| 38 | QT_DECLARATIVE = declarative | |
| 39 | @@ -135,7 +129,7 @@ | |
| 40 | # QtWidgets | |
| 41 | HAVE_QT_WIDGETS = yes | |
| 42 | contains(QT_MAJOR_VERSION, 5) { | |
| 43 | - !system(pkg-config QtWidgets) { | |
| 44 | + !system(pkg-config Qt5Widgets) { | |
| 45 | HAVE_QT_WIDGETS = no | |
| 46 | } | |
| 47 | } else { |