diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:24:47 +0100 |
| commit | d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0 (patch) | |
| tree | f01009393fe34a9a7bd42785b4211ce67e2088a2 /examples/svg/svgviewer/svgviewer.pro | |
| parent | f88807e62f48c0e4f714a40d306e1ed0caaa932a (diff) | |
| parent | 8ce0f65e1abf3b0b9a1684dac3a32cd0b03ffc3c (diff) | |
| download | qtsvg-d433198f60c30f0a2d8aae2dfb8fe2d04cc842a0.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
sync.profile
Change-Id: Ibeaf4db17361deb890b154c637a62cfd06b76e26
Diffstat (limited to 'examples/svg/svgviewer/svgviewer.pro')
| -rw-r--r-- | examples/svg/svgviewer/svgviewer.pro | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro index 9614741..eb2088c 100644 --- a/examples/svg/svgviewer/svgviewer.pro +++ b/examples/svg/svgviewer/svgviewer.pro @@ -4,22 +4,18 @@ RESOURCES = svgviewer.qrc SOURCES = main.cpp \ mainwindow.cpp \ svgview.cpp -QT += svg xml +QT += widgets svg xml -contains(QT_CONFIG, opengl): QT += opengl +qtHaveModule(opengl): QT += opengl CONFIG += console # install -target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer -sources.files = $$SOURCES $$HEADERS $$RESOURCES svgviewer.pro files -sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/svg/svgviewer -INSTALLS += target sources +target.path = $$[QT_INSTALL_EXAMPLES]/svg/svgviewer +INSTALLS += target wince*: { addFiles.files = files\\*.svg addFiles.path = "\\My Documents" DEPLOYMENT += addFiles } - -QT+=widgets |