summaryrefslogtreecommitdiffstats
path: root/src/gui/image
Commit message (Expand)AuthorAgeFilesLines
* Merge dev into 5.8Oswald Buddenhagen2016-08-226-7/+157
|\
| * Use qtConfig throughout in qtbaseLars Knoll2016-08-191-1/+1
| * Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-1/+1
| |\
| | * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-131-1/+1
| | |\
| | | * Doc: Change instances of '(Mac) OS X' to 'macOS'Topi Reinio2016-08-121-1/+1
| * | | Remove last uses of Java-style (non-mutable) iterators from QtBaseMarc Mutz2016-08-131-4/+2
| * | | Darwin: Add QImage::toCGImage() conversion functionMorten Johan Sørvig2016-08-113-0/+152
| * | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-091-1/+1
| |\| |
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-051-1/+1
| | |\|
| | | * Remove unneeded ';' after some macrosKai Pastor2016-08-041-1/+1
* | | | Support C++17 fallthrough attributeAllan Sandfeld Jensen2016-08-193-5/+5
* | | | Standardize some "We mean it" commentsFriedemann Kleint2016-08-175-16/+15
|/ / /
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-08-012-26/+24
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-012-26/+22
| |\|
| | * Backwards compatibility fix: No default colormap for Mono QImagesEirik Aavitsland2016-07-271-22/+20
| | * Update documentation regarding QPixmap HICON conversionsSérgio Martins2016-07-271-4/+2
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-261-0/+2
| |\|
| | * QImage::setAlphaChannel(): Check result of image conversionFriedemann Kleint2016-07-231-0/+2
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-191-2/+2
|\| |
| * | Doc: added doc for parameter isMaskNico Vertriest2016-07-111-2/+2
* | | Remove unused NativeImageAllan Sandfeld Jensen2016-07-145-163/+14
* | | Factor out qt_getImageText() and qt_getImageTextFromDescription()Anton Kudryavtsev2016-07-144-30/+40
* | | Fix/adapt the uses of {to,set,from}Time_t in the qtbase source codeThiago Macieira2016-07-061-1/+1
* | | Add qtguiglobal.h and qtguiglobal_p.hLars Knoll2016-07-0329-7/+31
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-214-13/+16
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-204-13/+16
| |\|
| | * Finally fix crash in inplace-modified data-constructed imagesEirik Aavitsland2016-06-152-11/+14
| | * QIconLoader: Fix typo in directoryMatchesSize()Palo Kisa2016-06-151-1/+1
| | * Fixed developer build for MinGWOliver Wolff2016-06-151-1/+1
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-137-41/+56
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-062-7/+15
| |\|
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-021-7/+9
| | |\
| | | * Really fix crash on certain malformed bmp imagesEirik Aavitsland2016-05-251-7/+9
| | * | Turn off optimization for checkForAlphaPixels on Windows ARMMaurice Kalinowski2016-05-231-0/+6
| | |/
| * | QtGui: use QStringRef to optimize memory allocationAnton Kudryavtsev2016-06-021-1/+1
| * | Gui: use const (and const APIs) moreAnton Kudryavtsev2016-06-014-12/+12
| * | Optimize QImage checkForAlphaPixelsAllan Sandfeld Jensen2016-05-231-21/+28
* | | Optimize QIconLoader::findIconHelper()John Lindgren2016-05-241-10/+12
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-123-8/+20
|\| |
| * | QImage::setPixelColor: warn about invalid colorsMitch Curtis2016-05-111-1/+7
| * | QImageWriter: use new QJsonObject::value(QLatin1String)Marc Mutz2016-05-101-3/+3
| * | Optimize convert_Indexed8_to_X32Allan Sandfeld Jensen2016-04-271-4/+10
* | | QtGui: Introduce delegating constructors.Friedemann Kleint2016-05-094-20/+5
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-031-1/+0
|\| |
| * | Fix some qdoc-warnings in 5.7.Friedemann Kleint2016-04-131-1/+0
* | | QtBase: use printf-style qWarning/qDebug where possible (II)Marc Mutz2016-05-031-2/+2
* | | Implement ordered dithering for image format conversionsAllan Sandfeld Jensen2016-04-122-7/+19
* | | Cleanup conversion parametersAllan Sandfeld Jensen2016-04-115-13/+14
* | | Always build JPEG and GIF support as pluginsLars Knoll2016-04-0710-2636/+5
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-04-052-25/+34
|\| |