summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Mention license change in 5.7.0 changelog.v5.7.05.7.0Friedemann Kleint2016-06-081-2/+18
* Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-192-2/+24
|\
| * Bump versionOswald Buddenhagen2016-05-191-1/+1
| * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-2/+0
| * Add changelog for Qt 5.6.1 releaseFriedemann Kleint2016-05-121-0/+24
* | Add changelog for Qt 5.7.0 releaseFriedemann Kleint2016-04-261-0/+22
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-0820-390/+399
|\ \ | |/
| * Fix old-style cast compile error in qaxobject.h.David Schulz2016-03-231-2/+2
| * Fix warnings as shown by Qt Creator's Clang based code model.Friedemann Kleint2016-03-2215-361/+370
| * Fix C-style cast in QAxWidget::qObject()Marc Mutz2016-03-221-1/+1
| * Make more ctors explicitMarc Mutz2016-03-225-9/+9
| * Make public headers compile with -Wzero-as-null-pointer-constantMarc Mutz2016-03-226-26/+26
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-221-0/+0
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-0710-136/+153
|\ \ | |/
| * Remove duplicated image conversion functions.Friedemann Kleint2016-02-225-136/+12
| * Add a control for manual testing.Friedemann Kleint2016-02-185-0/+141
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1Liang Qi2016-02-1517-152/+174
|\ \ | |/
| * Further string fixes: Replace ugly STRIPCB macro by static function.Friedemann Kleint2016-02-151-22/+22
| * Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-0/+22
| |\
| | * Merge 5.6 into 5.6.0v5.6.0-rc1v5.6.05.6.0Oswald Buddenhagen2016-02-022-2/+22
| | |\
| | * | Add changelog for Qt 5.6.0 releaseFriedemann Kleint2016-01-281-0/+22
| * | | dumpcpp: Introduce flags type ObjectCategories for enum ObjectCategory.Friedemann Kleint2016-02-121-10/+20
| * | | String fixes.Friedemann Kleint2016-02-116-18/+16
| * | | Remove Q_CC_BOR.Friedemann Kleint2016-02-103-19/+2
| * | | Introduce helper functions for ITypeInfo::GetNames().Friedemann Kleint2016-02-104-65/+52
| * | | Fix invocation of static methods.Friedemann Kleint2016-02-104-10/+10
| * | | Bump versionOswald Buddenhagen2016-02-081-1/+1
| * | | Remove unused variable as detected by Clang.Friedemann Kleint2016-02-051-2/+1
| * | | Add missing override declarations.Friedemann Kleint2016-02-052-4/+4
| | |/ | |/|
| * | testcon: Add options for application attributes.Friedemann Kleint2016-01-291-0/+20
| * | Change "argc" variable to have static lifetime.Fredrik Orderud2016-01-271-2/+2
| |/
| * Doc: added missing brief statementNico Vertriest2016-01-211-0/+3
* | Add more override.Friedemann Kleint2016-02-113-22/+22
* | Unify license header usageAntti Kokko2016-01-2716-80/+80
* | Updated license headersAntti Kokko2016-01-2531-510/+1064
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-2116-148/+594
|\ \ | |/
| * Adapt to High DPI scaling.Friedemann Kleint2016-01-184-45/+211
| * Fix use of QAxFactory with QT_NO_CAST_FROM_ASCII definedMike Gelfand2016-01-151-1/+1
| * Prevent creation of multiple QAxClientSite/QAxHostWidget objects.Friedemann Kleint2016-01-131-1/+2
| * Add a simple manual test for loading Active X controls.Friedemann Kleint2016-01-122-0/+177
| * Doc: Use QHP selectors that list the correct members for each moduleTopi Reinio2016-01-121-2/+2
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2016-01-071-1/+1
| |\
| | * Fix incorrect substring extraction of slot name.5.5Friedemann Kleint2016-01-041-1/+1
| * | testcon: Better adapt to High DPI screens.Friedemann Kleint2016-01-054-16/+8
| * | testcon: Set MainWindow instance pointer after setupUi().Friedemann Kleint2016-01-051-2/+2
| * | testcon: Add option to suppress installation of the message handler.Friedemann Kleint2016-01-043-15/+30
| * | testcon: Fix hangs when closing the window.Friedemann Kleint2015-12-222-0/+12
| * | testcon: Refactor registering script languages.Friedemann Kleint2015-12-221-3/+21
| * | testcon: Use m_ convention and constructor initialization for member variables.Friedemann Kleint2015-12-222-49/+49
| * | Fix infinite loop in MIME classinfo parser in ActiveQtv5.6.0-beta1Kati Kankaanpaa2015-12-081-1/+1