summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-09-02 17:02:01 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-30 18:08:37 +0200
commit24fb923ef697d91618e15ee0c66dd5b0d0a22579 (patch)
tree76f201189eb5ec8f16755b0ed566564df988e90f
parent800e4bc80f0d8d1ec1b7ba058a1eb2a61616937b (diff)
remove stale phonon reference
Change-Id: I0ab1c16d2a9b593782f846ac11374ff9727d72c1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--.gitignore1
-rw-r--r--tools/qml/qml.pro3
2 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index bccd9489..06432ae3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,7 +74,6 @@ bin/qttracereplay*
bin/rcc*
bin/uic*
bin/patternist*
-bin/phonon*
bin/qcollectiongenerator*
bin/qdbus*
bin/qhelpconverter*
diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro
index f9106876..397287e7 100644
--- a/tools/qml/qml.pro
+++ b/tools/qml/qml.pro
@@ -12,9 +12,6 @@ wince* {
qtHaveModule(scripttools) {
QT += scripttools
}
- contains(QT_CONFIG, phonon) {
- QT += phonon
- }
qtHaveModule(xmlpatterns) {
QT += xmlpatterns
}