summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-08-313-2/+155
|\
| * Adapt qmake's raw-string parser to avoid confusion by macrosEdward Welbourne2017-08-243-2/+155
* | uic: Use nullptr instead of Q_NULLPTR in generated codeAlexander Volkov2017-08-28102-995/+995
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-191-0/+4
|\|
| * Merge qt_error_string and QSystemErrorThiago Macieira2017-07-181-0/+4
* | uic: Don't clear and readd combobox items in retranslateUiJarek Kobus2017-07-058-80/+97
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-07-041-0/+4
|\|
| * Moc: Don't error out when parsing namespace __identifier(...)Olivier Goffart2017-06-191-0/+4
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-193-117/+212
|\|
| * uic: Fix possible crash when reading the size hint propertyJarek Kobus2017-06-132-117/+203
| * moc: Don't error out when defining a keywordOlivier Goffart2017-06-061-0/+9
* | moc: Allow NOTIFY signals defined in parent classesAlbert Astals Cid2017-05-232-6/+18
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-04-201-0/+1
|\|
| * Preserve last modification timestamps of installed filesSimon Hausmann2017-04-121-0/+1
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-281-1/+1
|\|
| * tst_moc: fix include guardsOlivier Goffart2017-03-251-1/+1
* | qmake: Add test functions for comparing version numbersAlexander Volkov2017-03-201-0/+38
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-202-22/+41
|\|
| * Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9Liang Qi2017-03-132-22/+26
| |\
| | * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-132-22/+26
| | |\
| | | * Make it possible to specify the RCC data version formatSimon Hausmann2017-02-281-2/+2
| | | * Properly use the "process" featureUlf Hermann2017-02-271-20/+24
| * | | moc: put the QPrivateSignal argument in the arg arrayOlivier Goffart2017-03-131-0/+15
| |/ /
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-03-146-4/+101
|\| |
| * | moc: Add support for C++17 nested namespaces (N4230)Olivier Goffart2017-03-083-1/+86
| * | moc: Fix parsing of digit separatorOlivier Goffart2017-03-081-0/+4
| * | Make uic handle -no-feature-shortcutPaul Olav Tvete2017-03-063-3/+11
* | | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-02-171-0/+16
|\| |
| * | moc: error out when the Q_PLUGIN_METADATA file can't be openedOlivier Goffart2017-02-101-0/+16
| |/
* / tst_uic: Update version regexpFriedemann Kleint2017-02-031-2/+3
|/
* qmake: introduce magic bypassNesting() scopeOswald Buddenhagen2016-12-132-0/+94
* Fix missing last modification time stamp in qrc contentSimon Hausmann2016-11-222-5/+22
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-161-2/+2
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-11-151-2/+2
| |\
| | * fix $$section()'s bad argument count error messageOswald Buddenhagen2016-11-141-2/+2
* | | qmake: make discard_from() patch up QMAKE_INTERNAL_INCLUDED_FILES as wellOswald Buddenhagen2016-11-151-1/+3
* | | qmake: let discard_from() discard function definitions as wellOswald Buddenhagen2016-11-152-2/+12
* | | Improve QMake JSON errorAllan Sandfeld Jensen2016-11-151-1/+1
* | | remove unnecessary references to $$QMAKE_CFLAGS_DBUSOswald Buddenhagen2016-10-042-3/+0
* | | moc: support nested q_namespacesBogDan Vatra2016-09-283-1/+149
* | | moc: Fix asserts on moc on empty token preceding ## operatorOlivier Goffart2016-09-162-0/+6
* | | Check the context of Q_ENUM[_NS] and Q_FLAG[_NS]BogDan Vatra2016-09-151-0/+28
* | | Parse namespaces only for current file, add Q_NAMESPACE support to qmakeBogDan Vatra2016-09-063-1/+10
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-05102-985/+985
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-05102-985/+985
| |\|
| | * uic: generate translate calls with Q_NULLPTR instead of 0Dyami Caliri2016-09-03102-985/+985
* | | add discard_from() functionOswald Buddenhagen2016-08-252-1/+16
* | | Say hello to Q_NAMESPACEBogDan Vatra2016-08-191-0/+110
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-162-3/+3
|\| |
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-102-3/+3
| |\|