diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-12-03 15:38:50 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-09 15:40:18 +0100 |
| commit | b0f83f2284af777f17e06e084a2399f9ad2a87f8 (patch) | |
| tree | 66c9180c996bda2e9f8f25cd062e3d62ea0def7a /src/gui/image | |
| parent | fbc6240cc6f4846fbde1ee8dff6cda28863ed55f (diff) | |
Simplify linking to different jpeg libs.
This makes it slightly more obvious which compiler should be used with
which.
Task-number: QTBUG-23119
Change-Id: Ie3e5cf995d686bfa846902a040668716c8b5f526
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Diffstat (limited to 'src/gui/image')
| -rw-r--r-- | src/gui/image/qjpeghandler.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/image/qjpeghandler.pri b/src/gui/image/qjpeghandler.pri index 3cb35c95ed..c8de33d8b4 100644 --- a/src/gui/image/qjpeghandler.pri +++ b/src/gui/image/qjpeghandler.pri @@ -3,8 +3,10 @@ INCLUDEPATH *= $$PWD HEADERS += $$PWD/qjpeghandler_p.h SOURCES += $$PWD/qjpeghandler.cpp contains(QT_CONFIG, system-jpeg) { - if(unix|win32-g++*): LIBS += -ljpeg - else:win32: LIBS += libjpeg.lib + msvc: \ + LIBS += libjpeg.lib + else: \ + LIBS += -ljpeg } else { include($$PWD/../../3rdparty/libjpeg.pri) } |