From 011b4a2b81193096934d010ce3f9029db1ba61d1 Mon Sep 17 00:00:00 2001 From: "ossy@webkit.org" Date: Thu, 31 Mar 2011 03:48:34 +0000 Subject: [PATCH] [Qt] Typo fix, remove an accidentally added line. * Source/WebKit.pri: git-svn-id: https://svn.webkit.org/repository/webkit/trunk@82542 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 6 ++++++ Source/WebKit.pri | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1ba0018..4ffbb80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2011-03-30 Csaba Osztrogonác + [Qt] Typo fix, remove an accidentally added line. + + * Source/WebKit.pri: + +2011-03-30 Csaba Osztrogonác + [Qt] Rollout r82240 and r82232, because they broke 2 plugin tests. * Source/WebKit.pri: diff --git a/Source/WebKit.pri b/Source/WebKit.pri index 642c95d..15f83ca 100644 --- a/Source/WebKit.pri +++ b/Source/WebKit.pri @@ -137,7 +137,6 @@ symbian|maemo5|maemo6 { contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS !contains(QT_CONFIG, modular) { - QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon QT.phonon.libs = $$QMAKE_LIBDIR_QT } -- 1.8.3.1