Changeset 82605 in webkit


Ignore:
Timestamp:
Mar 31, 2011 12:30:25 PM (13 years ago)
Author:
commit-queue@webkit.org
Message:

2011-03-31 Marius Storm-Olsen <marius.storm-olsen@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Properly detect phonon include, and avoid double qtLibraryTarget() call
https://bugs.webkit.org/show_bug.cgi?id=57017

Build fix. No new tests.

  • WebCore.pri:

2011-03-31 Marius Storm-Olsen <marius.storm-olsen@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Properly detect phonon include, and avoid double qtLibraryTarget() call
https://bugs.webkit.org/show_bug.cgi?id=57017

Build fix. No new tests.

Location:
trunk/Source
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r82604 r82605  
     12011-03-31  Marius Storm-Olsen  <marius.storm-olsen@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Properly detect phonon include, and avoid double qtLibraryTarget() call
     6        https://bugs.webkit.org/show_bug.cgi?id=57017
     7
     8        Build fix. No new tests.
     9
     10        * WebCore.pri:
     11
    1122011-03-31  Vsevolod Vlasov  <vsevik@chromium.org>
    213
  • trunk/Source/WebCore/WebCore.pri

    r81273 r82605  
    301301    win32-*|wince* {
    302302        DLLDESTDIR = $$OUTPUT_DIR/bin
    303         build_pass: TARGET = $$qtLibraryTarget($$TARGET)
     303        isEmpty(QT_SOURCE_TREE):build_pass: TARGET = $$qtLibraryTarget($$TARGET)
    304304
    305305        dlltarget.commands = $(COPY_FILE) $(DESTDIR_TARGET) $$[QT_INSTALL_BINS]
  • trunk/Source/WebKit/qt/ChangeLog

    r82586 r82605  
     12011-03-31  Marius Storm-Olsen  <marius.storm-olsen@nokia.com>
     2
     3        Reviewed by Kenneth Rohde Christiansen.
     4
     5        [Qt] Properly detect phonon include, and avoid double qtLibraryTarget() call
     6        https://bugs.webkit.org/show_bug.cgi?id=57017
     7
     8        Build fix. No new tests.
     9
     10        * QtWebKit.pro:
     11
    1122011-03-31  Evan Martin  <evan@chromium.org>
    213
  • trunk/Source/WebKit/qt/QtWebKit.pro

    r82125 r82605  
    323323                CONFIG += build_all
    324324            } else {
    325                 debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
     325                isEmpty(QT_SOURCE_TREE):debug_and_release:TARGET = $$qtLibraryTarget($$TARGET)
    326326            }
    327327
Note: See TracChangeset for help on using the changeset viewer.