diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-09 10:33:49 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-02-09 12:44:40 +0100 |
| commit | 7caeb1d6270640c8ab5f4d8b096e4b65a8e58023 (patch) | |
| tree | 90ecaff56156506bb28fbf469ab2c545e23c51a9 /src/plugins/imageviewer/imageviewer.pro | |
| parent | 622cac50f46ff2940a02527c75b9bed4589f9988 (diff) | |
| download | qt-creator-7caeb1d6270640c8ab5f4d8b096e4b65a8e58023.tar.gz | |
Fix compilation with Qt5.
- Add missing QtScript module (pulled by json in utils
- Include type definitions for Q_DECLARE_METATYPE
- Unconditionally include QtSvg in Qt5
Change-Id: If298dd98fb660a6ba701f1ba36ced2d2027ea3e8
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/imageviewer/imageviewer.pro')
| -rw-r--r-- | src/plugins/imageviewer/imageviewer.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/imageviewer/imageviewer.pro b/src/plugins/imageviewer/imageviewer.pro index 40a15d89b7..1b9005d786 100644 --- a/src/plugins/imageviewer/imageviewer.pro +++ b/src/plugins/imageviewer/imageviewer.pro @@ -26,7 +26,11 @@ RESOURCES += \ OTHER_FILES += \ ImageViewer.mimetypes.xml -contains(QT_CONFIG, svg):QT += svg +greaterThan(QT_MAJOR_VERSION, 4) { + !isEmpty(QT.svg.name): QT += svg +} else { + contains(QT_CONFIG, svg):QT += svg +} FORMS += \ imageviewertoolbar.ui |