summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add change file for Qt 5.6.3v5.6.35.6.3Antti Kokko2017-09-011-0/+27
| | | | | | | | Task-number: QTBUG-62720 Change-Id: I1cfb0ef390f1e7d8f1cb289f898e7915201f7ea1 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> (cherry picked from commit 1c643431ae034853a7e0c46adf90a68ec7cbfc01)
* Qt Designer: Fix crash in "Go to slot" dialog when no signal is selectedFriedemann Kleint2017-05-291-7/+10
| | | | | | | | | Add a check for the selection. Task-number: QTBUG-61009 Change-Id: Ic99d8ca2b9b838b2cb24f1cf4b259c38e2a6f1ca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> (cherry picked from commit 9f3354218321c326c05f9d4627c462c781d1714e)
* Write debugger command to assetsBogDan Vatra2017-04-251-0/+13
| | | | | | | Change-Id: I0a8e44106aa3ada8267438c173c2d8dfe9f511e6 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit cf291537ab218cd93c87675f693abed473065468)
* Use gradle from Qt locationBogDan Vatra2017-04-111-16/+1
| | | | | | | | | Because now we control everything we don't need to update Gradle's urls Task-number: QTBUG-59237 Change-Id: Idfcd20a6d4bdd2b269bb5675ad9938bf403b67c5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 26be57463c9a29b40c205b2f19aaf9ae79b6ab6a)
* Bump copyright yearFriedemann Kleint2017-03-286-6/+6
| | | | | | | Task-number: QTBUG-59648 Change-Id: I4aba86e684ca6073228e556000599781303b74bd Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 224a4bdc0380b15e6a8f07dc0d4bf9ae4dae1996)
* winrtrunner: Fix waiting for local package (un-)installationOliver Wolff2017-03-271-10/+64
| | | | | | | | | | | | | | | Debugging did not work on some machines as the waiting loop used in qlocalappxengine was not implemented properly. Instead of relying on an undocumented return value of GetResults we register a callback that is triggered when the deployment operation is finished and trigger an event inside that callback in order to avoid a busy loop. Task-number: QTCREATORBUG-17907 Change-Id: I5d2211cfabb71592efa520cf53ad84facf79a4df Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> (cherry picked from commit 3947d229cb8ed8dde5ab72708a4a149ac6d83cae)
* Fix lupdate to handle \u escapesEdward Welbourne2017-03-213-2/+20
| | | | | | | | | | | | It treated \u as u, which isn't correct. Instead, read the number following and convert, via QChar, to UTF-8 encoding in the byte array (that'll later be .fromUtf8()ed). Added a simple test-case. Change relative to source of cherry-pick: s/nullptr/Q_NULLPTR/g. Task-number: QTBUG-35164 Change-Id: Ib23cc5e5fb98e6cb8715b4018545e40a40e271d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> (cherry picked from commit 5e3617bef5bc7e4c98fb63514471c49800feef03)
* Bump versionOswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: I2fe342422189389f30b3460a50bbf6ee51e1260d
* Qt Designer: Remove unused variableFriedemann Kleint2016-11-161-1/+0
| | | | | | | | | | | Fix warning: widgetbox\widgetboxtreewidget.cpp:70:20: warning: 'qtLogoC' defined but not used [-Wunused-variable] static const char *qtLogoC = "qtlogo.png"; Amends change 6b6b7786cfe0a90aaed359bafb7a9be2bd0502f9. Change-Id: I4908a067c654d706f24d0afafd99142241ad3f69 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* pixeltool: Check whether initial geometry is applicableFriedemann Kleint2016-11-081-6/+21
| | | | | | | | | | | | When changing primary screens of multi-monitor-setups on Windows, out-of-screen positions might be saved which make it impossible to bring the tool back and also cause crashes when no screen is found for grabbbing. Check the saved position when reading the settings and check if a screen can be obtained for grabbing. Change-Id: I69ec677e144306290a4ee7a3e84f87dd600ff086 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* remove dependencies from sync.profileOswald Buddenhagen2016-11-061-13/+0
| | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: I030c3c28510163bc7c35f82808b3882e68e51857 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* macOS: Handle -qtlibinfix correctly in macdeployqtAndy Shaw2016-10-261-5/+29
| | | | | | | | | | | When Qt is configured with -qtlibinfix then it will insert the specified setting inside the framework names. Therefore QtCore.framework can be called QtCoreLibInfix.framework. This means that we have to account for this in macdeployqt when determining which plugins should be deployed. Change-Id: I30fc7434fa87d1b41c2cacfbc9f76d4ce5491329 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* lupdate: Add qrc resource file supportTakumi ASAKI2016-10-2513-57/+294
| | | | | | | | | | | lupdate parses qrc files specified by the RESOURCES qmake variable or by command line options, and adds files in them as source files. [ChangeLog][lupdate] Added qrc resource file support Task-number: QTBUG-53206 Change-Id: Id7f952487ab11e062db9c5a419fb2ee3c4716740 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* prevent .prf files from postponing work to build passesOswald Buddenhagen2016-10-254-14/+39
| | | | | | | | | | | | ... as lupdate doesn't execute any. this increases the chance that we will get a complete picture of the project. this is preparation for lupdate interpreting .qrc files. Task-number: QTBUG-53206 Change-Id: I5e10b44637d527799f55c578a99076eb4750f131 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
* fix test execution in dirs with spacesOswald Buddenhagen2016-10-252-6/+6
| | | | | Change-Id: Ib99cf27f50f32eb23d278f5b9a9c279d10da4ece Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* deduplicate test command launching a bitOswald Buddenhagen2016-10-252-13/+15
| | | | | | | pre-calculate the lrelease/lconvert path once. Change-Id: Ia1603db955ef08e61d123393f6e69c4653d8b6a9 Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Doc: Update documentation on \legalese QDoc commandTopi Reinio2016-10-251-35/+11
| | | | | | | | | | | | The \legalese command is not used in Qt 5 documentation, because it does not support collating license texts across modules. Update the documentation accordingly, and remove the obsolete example on how it's being used in Qt docs. Change-Id: Id3505ccf5b44bd2c2e236b8464dea18d4c7b8a89 Reviewed-by: Martin Smith <martin.smith@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* designer-manual.qdoc: Fix typo in documentationFrederik Schwarzer2016-10-181-1/+1
| | | | | | Change-Id: I46c41a94ab1429e527ef01e342ee3f6578fa1876 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Introduce utility function for the Qt logo iconFriedemann Kleint2016-10-125-13/+25
| | | | | | | | | | | | Add a function qtLogoIcon() returning a multi-size icon to iconloader_p.h. Adapt the plugin dialog and widget box so that the logo icon is returned for empty icon names. Task-number: QTBUG-55137 Change-Id: If6843e75577b05c3bfcedf976849eba88b914547 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Qt Designer: Update logo icon used for iconless custom pluginsFriedemann Kleint2016-10-126-1/+4
| | | | | | | | | | Replace the single size Qt logo by a series of icons, providing higher resolutions for High DPI. Task-number: QTBUG-55137 Change-Id: Ib128f679a8d9c6ce39ec0ae76c0d569d142aa636 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* windeployqt: Fix temporary file leakFriedemann Kleint2016-10-101-1/+2
| | | | | | | | | Set FILE_FLAG_DELETE_ON_CLOSE on the files used for redirectoring process outputs. Task-number: QTBUG-56268 Change-Id: Ia0b25ed9067e0a40a9b83dc7d10a9cf15ac63b70 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* make write_file() capable of making files (not) executableOswald Buddenhagen2016-09-304-13/+36
| | | | | | | | Change-Id: I9ca96bc3408160261781697a3471c1f446c86c3a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> (cherry picked from qtbase/57ca8d2698f1eaf30f1110ba47445c04d2bcd0f7) (cherry picked from qtbase/85d7c732e9b84a9afdb040d01e7bb7166f605abe) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* terminate when command called by system() got SIGINT or SIGQUITOswald Buddenhagen2016-09-291-3/+10
| | | | | | | | | this doesn't actually do anything in lupdate; just syncing up. Change-Id: I5e5df9f6d136601f0f36a8d645f90a1cab9995ad Reviewed-by: Lars Knoll <lars.knoll@qt.io> (cherry picked from qtbase/f8ef7e1d2619e6d394c57561bb275767f0517b24) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix raw data leak in $$absolute_path()Oswald Buddenhagen2016-09-291-1/+5
| | | | | | | | | | | when the file name is empty, the path will be returned verbatim. this must be considered when constructing the return value. Task-number: QTBUG-54550 Change-Id: Ie108ed52275e66a154ef63bd6f7193f55b3e0454 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/3c8134958c66f40bb86588aa91b83bf58b5de0c9) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix calculations of worst-case size requirements for token bufferOswald Buddenhagen2016-09-291-6/+9
| | | | | | | | Change-Id: I3aa4c736acec44f95a0a33c7baae9276568f684f Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/d459a6b0e0d4f128caceaafe981ecf374bb3e420) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix custom functions inheriting other functions' argumentsOswald Buddenhagen2016-09-291-17/+39
| | | | | | | | | | Task-number: QTBUG-41830 Change-Id: Iba3eee4975a1ee671b7190e52c0efc9a18147c62 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/dacf3994ba29106132c3a377dba303acdb74daca) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make error() propagate from requires() and REQUIRES=Oswald Buddenhagen2016-09-293-6/+12
| | | | | | | | | | that can make sense if a function which determines the availability of a dependency fails to do so for unexpected reasons. Change-Id: If6cd113df25aee66830c120a2fab067c822a4543 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/1b4ea11332f74984a62a4cc4597ad49f5b5269dc) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* make error() propagate from custom replace functionsOswald Buddenhagen2016-09-292-51/+73
| | | | | | | | | it didn't, which is rather unexpected. Change-Id: I8cdb7b1490a8c2207809812b93cc65fbe23a1b98 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/339b9706ccbed4063a92337c9994731793558b0a) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* fix error() not propagating through if()Oswald Buddenhagen2016-09-293-7/+8
| | | | | | | | | | if() would simply "downgrade" a fatal error to a false condition, which is certainly not expected. Change-Id: Ie9c54f2bddf588856498bf795007b341b7c9363a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/b27d4835c2ae0d8767ca914acb72a4bdcea6fc85) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* nuke dead expandVariableReferences() overload prototypeOswald Buddenhagen2016-09-291-1/+0
| | | | | | | Change-Id: I0c6fceac0b984e4613932b8507a632dd83d0e79b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/d0055e9fd7825f9033b26f9aa421e218e44dadde) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Use popen() with binary under WindowsMat Sutcliffe2016-09-292-2/+9
| | | | | | | | | Works around a bug in the Windows C Runtime. Change-Id: I792599a4cd7822f109fa921f02207fb1b144b1d1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/23bce6b169ca14ff72b672965ed5f89424c2d8fe) Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* qmake: fix UB in QMakeParser::putHashStr()Marc Mutz2016-09-291-1/+2
| | | | | | | | | | | | | | Found by UBSan: qmake/library/qmakeparser.cpp:278:33: runtime error: null pointer passed as argument 2, which is declared to never be null Guard the call. Change-Id: I99341ab439a511f366dae9344ddcc8727c33b9b6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/1fd0d57ce3da83631423d17faadf97133f5c7835) Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* QMake: replace QStringLiteral with QLatin1StringAnton Kudryavtsev2016-09-291-1/+1
| | | | | | | | | | ... in string comparisons. It's more efficient. Change-Id: I5d54ab7777a0838455eaaac671e735eb37bfe243 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> (cherry picked from qtbase/f384c3097911c523e67620b77b1086e4788cd209) Reviewed-by: Anton Kudryavtsev <a.kudryavtsev@netris.ru> Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* windeployqt: Add QtSerialBusFriedemann Kleint2016-09-141-2/+6
| | | | | | | | Add library and plugin directory. Task-number: QTBUG-55977 Change-Id: I594cea7f7d18bbf6e8e0e07e1ea48b76dcbe64fc Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
* BC data files for QtTools for Qt 5.6Milla Pohjanheimo2016-09-053-0/+57683
| | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: Ibe71e2ae4da3c886bc3871f5fa495664fb76a880 Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
* Qt Designer: Adapt warning about mismatched class namesv5.6.25.6.2Friedemann Kleint2016-08-311-11/+23
| | | | | | | | | Move the exclusion check to a static function and suppress the warning for the fake QWebEngineView class, too. Task-number: QTBUG-53984 Change-Id: I445bcf37b92e5677342e18698fd4b0b07fa4ca10 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Qt Designer: Adapt URL in QUrl property completion list to qt.ioFriedemann Kleint2016-08-221-1/+1
| | | | | Change-Id: Iaa5783b026ecb98d39000b408421aa13f965e2ca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-154-9/+9
| | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase), except within \code blocks in QDoc manual, where macros are not expanded. Change-Id: Ic742163948f3970d2acaa179eb02d4e0c1593bf8 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qdoc: Comment what's left of main() to clarify what it's doingEdward Welbourne2016-08-081-3/+5
| | | | | Change-Id: Iaffd91fc1d6a31bc2ade50f1fad6f1d544b07f73 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* qdoc: sub-class command-line parser to declutter main()Edward Welbourne2016-08-081-101/+127
| | | | | | | | | | | | | More than two thirds of main() concerned parsing the command-line arguments and settings globals, interacting minimally with the rest. So split that code out into a sub-class of the command-line parser, to make main() itself easier to read. Changed a QStringLiteral to a QLatin1String to work round an MSVC-2010 issue. Change-Id: Idd5fec280b0ce631f1d6d2a79cb59f9c4171eceb Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* winrtrunner: Fix deployment of QtQuick applications when using appxMaurice Kalinowski2016-08-081-6/+11
| | | | | | | | | | | | | | | | | For remote devices winrtrunner needs to create an appx package for deployment. While creating that package a file extension list has been used to identify potential files by Qt which need to be deployed. This was broken for Qt Quick Controls applications, but also for projects using for instance jpeg image files. Instead, switch to an exclusion list of file extensions we can be sure should not be part of the package. In the worst case the package is too big when deployed with winrtrunner, but will not cause runtime errors anymore. Change-Id: Ief6d4aaf9bc0933b32734feacbef170dcc8ab945 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Update Qt logo in qdoc manualFriedemann Kleint2016-08-051-0/+0
| | | | | | Task-number: QTBUG-55137 Change-Id: I60e25790eda55db78d2a474b1d269db33439f83b Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* macdeployqt: add library search pathGuilherme Steinmann2016-07-272-2/+23
| | | | | | | | | | | | | | | | | In earlier versions of OSX, the folder '/usr/lib/' is protected by default and user libraries cannot be copied to that folder. Alternatively, providing an option for alternative library search path would avoid missing libraries during the deploy. The addition of the option '-libpath=<path>' to macdeployqt adds a search path for the dependencies. If a dependency was not found in the provided path, the default folder for searching is used. [ChangeLog][macdeployqt] Added option '-libpath' to search libraries in a custom path. Change-Id: I3afee6aaa3bc25521adecb91ec59d104e13834ed Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* winrtrunner: Add support for installing packagesMaurice Kalinowski2016-07-203-47/+80
| | | | | | | | | | So far winrtrunner was only capable of creating a package manually, not to specify a package to install. This can be very helpful for testing purposes. Change-Id: Idecbea3c3413662a1f42f60fec60832eac7e7626 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* winrt: arm: copy ucrtbased.dll in debug modeMaurice Kalinowski2016-07-201-0/+27
| | | | | | | | | | | | | | | For Windows 10 / MSVC2015 winrtrunner fails to run an app in debug mode on an arm device as symbols were not found (neither in the system or c- runtime dependency). Those symbols are inside ucrtbased.dll. Visual Studio 2015 silently adds this library to the package resulting in a different content compared to windeployqt. Hence, copy ucrtbased.dll manually from windeployqt as well, which will later on be packaged by winrtrunner. Task-number: QTBUG-52969 Change-Id: If43a814b800d0756d111557a042aa23a22d7589f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Skip deployment of dependencies with lower version numberMaurice Kalinowski2016-07-201-1/+6
| | | | | | | | | | | | | | | | | Depending on the setup there might be a newer version of a dependency on the target device compared to the local setup. For instance one can have a preview build installed, but the development environment runs on a stable version. In that case deployment of the C-Runtime is rejected as a newer version is available. Instead of returning an error, report a warning and continue, relying on the fact that the newer version stays binary compatible. Unfortunately, there is no "proper" error code for this, so we need to use the value itself. Task-number: QTBUG-54251 Change-Id: I83b66653c776665a4aae6ab138d8d292def426f5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Fix build of Android on API level >=21André Klitzing2016-07-201-1/+5
| | | | | | | | | System header <sys/timeb.h> does not exists anymore since API level 21. Task-number: QTBUG-43284 Change-Id: I4b9ca70198ea47d3a32169ff7c35f4fae50f147a Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* qtdiag: Fix output of screen geometries for negative coordinatesFriedemann Kleint2016-07-201-1/+1
| | | | | | | | Use forcesign to format the screen position correctly in multiple monitor setups where the primary monitor is on the right. Change-Id: I6a4161e326dc3ad220bd9b1e60d8ca5bb27f6f49 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* windeployqt: Fix option --dry-runFriedemann Kleint2016-07-181-7/+11
| | | | | | | | | Suppress patching of Qt5Core and the creation of the translations directory when the option is set. Task-number: QTBUG-54765 Change-Id: I599925db49750014b54d4d8976f0ee4d05d6ca58 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Give editable combo boxes an arrow cursor in the form designerAlex Henrie2016-07-011-1/+3
| | | | | | | | | | The cursor of the line edit control of a combo box is set to I-Beam automatically when it is created. However, we don't want to display an I-Beam in the form designer unless we are actually editing text. Task-number: QTCREATORBUG-16519 Change-Id: I855a44bc3ed8616f8fefba021ff3cf5d74fc8b32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
View Lorry Controller Status