2011-04-08 Kristian Amlie <kristian.amlie@nokia.com>

        Reviewed by Andreas Kling.

        [Qt] Remove modular references after support for the flag was removed.
        https://bugs.webkit.org/show_bug.cgi?id=57018

        Removed modular references after support for the flag was removed.

        Support was removed because the Qt Modularization project decided we
        don't need it. It's better to base decisions on the available
        information, as demonstrated in the patch by checking
        QT.phonon.includes.

        * Source/WebKit.pri:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@83340 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 4cb8f643
2011-04-08 Kristian Amlie <kristian.amlie@nokia.com>
Reviewed by Andreas Kling.
[Qt] Remove modular references after support for the flag was removed.
https://bugs.webkit.org/show_bug.cgi?id=57018
Removed modular references after support for the flag was removed.
Support was removed because the Qt Modularization project decided we
don't need it. It's better to base decisions on the available
information, as demonstrated in the patch by checking
QT.phonon.includes.
* Source/WebKit.pri:
2011-04-07 Anna Cavender <annacc@chromium.org>
Reviewed by Eric Carlson.
......
......@@ -134,9 +134,9 @@ symbian|maemo5|maemo6 {
####
contains(QT_CONFIG, modular):!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS
!contains(QT_CONFIG, uitools)|disable_uitools: DEFINES *= QT_NO_UITOOLS
!contains(QT_CONFIG, modular) {
isEmpty(QT.phonon.includes) {
QT.phonon.includes = $$QMAKE_INCDIR_QT/phonon
QT.phonon.libs = $$QMAKE_LIBDIR_QT
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment