7b3b6b5afa
Conflicts: examples/opengl/cube/main.cpp examples/widgets/applicationicon/main.cpp examples/widgets/orientation/main.cpp src/gui/image/qicon.cpp src/gui/image/qimage.h src/gui/image/qpixmap.h src/gui/image/qpixmap_mac.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qpalette.cpp src/gui/kernel/qwidget.cpp src/gui/styles/qmacstyle_mac.mm src/gui/widgets/qmenubar.cpp src/gui/widgets/qslider.cpp src/opengl/qwindowsurface_gl.cpp tests/auto/qvariant/qvariant.pro tests/benchmarks/corelib/kernel/qobject/qobject.pro tests/benchmarks/gui/animation/qanimation/qanimation.pro tests/benchmarks/gui/graphicsview/qgraphicsanchorlayout/qgraphicsanchorlayout.pro tests/benchmarks/gui/graphicsview/qgraphicsitem/qgraphicsitem.pro tests/benchmarks/gui/graphicsview/qgraphicsscene/qgraphicsscene.pro tests/benchmarks/gui/graphicsview/qgraphicsview/qgraphicsview.pro tests/benchmarks/gui/graphicsview/qgraphicswidget/qgraphicswidget.pro tests/benchmarks/gui/image/qimagereader/qimagereader.pro tests/benchmarks/gui/itemviews/qtableview/qtableview.pro tests/benchmarks/gui/kernel/qapplication/qapplication.pro tests/benchmarks/gui/kernel/qwidget/qwidget.pro tests/benchmarks/gui/painting/qpainter/qpainter.pro tests/benchmarks/gui/painting/qtbench/qtbench.pro tests/benchmarks/gui/painting/qtracebench/qtracebench.pro tests/benchmarks/gui/text/qtext/qtext.pro Change-Id: I4b911c795ecb29d73b6a7fd18819711b49478a30
33 lines
733 B
Prolog
33 lines
733 B
Prolog
load(qttest_p4)
|
|
|
|
QT += widgets
|
|
SOURCES += tst_qicon.cpp
|
|
RESOURCES = tst_qicon.qrc
|
|
|
|
wince* {
|
|
QT += xml svg
|
|
addFiles.files += $$_PRO_FILE_PWD_/*.png
|
|
addFiles.files += $$_PRO_FILE_PWD_/*.svg
|
|
addFiles.files += $$_PRO_FILE_PWD_/*.svgz
|
|
addFiles.files += $$_PRO_FILE_PWD_/tst_qicon.cpp
|
|
addFiles.path = .
|
|
DEPLOYMENT += addFiles
|
|
|
|
DEPLOYMENT_PLUGIN += qsvg
|
|
DEFINES += SRCDIR=\\\".\\\"
|
|
} else:symbian {
|
|
QT += xml svg
|
|
addFiles.files = *.png tst_qicon.cpp *.svg *.svgz
|
|
addFiles.path = .
|
|
DEPLOYMENT += addFiles
|
|
qt_not_deployed {
|
|
plugins.files = qsvgicon.dll
|
|
plugins.path = iconengines
|
|
DEPLOYMENT += plugins
|
|
}
|
|
} else {
|
|
DEFINES += SRCDIR=\\\"$$PWD\\\"
|
|
}
|
|
|
|
CONFIG+=insignificant_test
|