whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/gui/image/qicon
History
Liang Qi 72f5867f14 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/kernel/qcoreapplication.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/network/bearer/qnetworkconfiguration.cpp
	src/plugins/bearer/blackberry/qbbengine.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
	src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
	src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
	src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
	src/plugins/platforms/qnx/qqnxwindow.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qwindowsvistastyle.cpp
	src/widgets/styles/qwindowsxpstyle.cpp
	src/widgets/widgets/qtoolbararealayout.cpp
	tests/auto/corelib/global/qflags/qflags.pro
	tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp

Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4
 		2015-12-02 23:33:06 +01:00
..
icons QIconLoader: Use the GTK+ icon caches 2015-09-13 16:23:24 +00:00
second_icons/testtheme/32x32/actions Fixed icons lookup in QIcon::fromTheme 2015-02-02 23:28:19 +00:00
styles/commonstyle/images tst_QIcon: Fix availableSizes() and task223279_inconsistentAddFile() 2013-07-15 16:28:25 +02:00
.gitignore
…
image.png
…
qicon.pro Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
rect.png
…
tst_qicon.cpp Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
tst_qicon.qrc QIconLoader: Use the GTK+ icon caches 2015-09-13 16:23:24 +00:00