diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-04-20 11:57:07 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-22 11:58:44 +0200 |
| commit | 3c46de47d5586fc98a25ad5fe9d55b4600d3a1a0 (patch) | |
| tree | d0b476652d7c4e401ac3135b5204bcf004f3b9a7 | |
| parent | 05d48138c82ddf6b0f070c8216cb8e2c245bb969 (diff) | |
| download | qtwebkit-3c46de47d5586fc98a25ad5fe9d55b4600d3a1a0.tar.gz | |
[Qt][Mac] Remove obsolete workaround for debug builds
https://bugs.webkit.org/show_bug.cgi?id=114750
http://trac.webkit.org/changeset/148789
Reviewed by Jocelyn Turcotte.
This workaround made default builds fail with recent Qt5 because
it removed the major version number from the library name, producing
QtWebKitWidgets, whereas the linking command line tried to link
against Qt5WebKitWidgets.
Debug builds are possible with and without framework-enabled builds
of Qt, but the debug versions of the Qt libraries have to be present.
Debug builds with a release version of Qt are not possible on Mac
since for debug builds qmake produces a linker command line where
all the Qt libraries have the "_debug" suffix, therefore if the debug
libraries are missing the build fails.
Task-number: QTBUG-30466
Change-Id: Ib9dd1300e8a54b5ac793ebf2732a3db37c878774
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/widgetsapi.pri | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/widgetsapi.pri b/Source/widgetsapi.pri index 0e7b44be2..50262742c 100644 --- a/Source/widgetsapi.pri +++ b/Source/widgetsapi.pri @@ -71,9 +71,6 @@ BASE_TARGET = $$TARGET load(qt_module) -# Allow doing a debug-only build of WebKit (not supported by Qt) -macx:!debug_and_release:debug: TARGET = $$BASE_TARGET - # Make sure the install_name of the QtWebKit library point to webkit force_independent:macx { # We do our own absolute path so that we can trick qmake into |