AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7f269a5db8
qt5base-lts/tests/auto/gui/image/qicon
History
Liang Qi ce09ef4313 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
2017-06-19 16:12:34 +02: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 QIcon: move back to QtGui 2012-05-18 21:42:38 +02:00
image.png QIcon: move back to QtGui 2012-05-18 21:42:38 +02:00
qicon.pro Fix tst_QIcon for configurations with builtin_testdata 2017-06-13 12:36:29 +00:00
rect.png QIcon: move back to QtGui 2012-05-18 21:42:38 +02:00
tst_qicon.cpp Merge remote-tracking branch 'origin/5.9' into dev 2017-06-19 16:12:34 +02:00
tst_qicon.qrc QIconLoader: Use the GTK+ icon caches 2015-09-13 16:23:24 +00:00