summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Doc: add image path for Remote Control Examplev5.4.25.4.2Leena Miettinen2015-03-161-0/+3
| | | | | | | | | So that it will not be marked "broken" in Qt Creator examples. Task-number: QTBUG-41996 Change-Id: I22cd0efc28a46ab99a5d8aee57a5a3f76714d447 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* bic: Add/Replace 5.{0.1,2,3,4}.0 bic data for linux-gcc-amd64Sergio Ahumada2015-03-1121-80019/+211076
| | | | | | | | | Remove the ia32 data since there are no linux x86 machines in the CI system (which makes the data useless from an automated testing point of view) and most people use x64 these days anyway. Change-Id: I0fd47bf62087b1e9c45afbd9b5c22f27c8bab12b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix lupdate for .ui.qml filesThomas Hartmann2015-03-101-1/+1
| | | | | | | | | The context has to be the complete base name including ".ui". Task-number: QTBUG-44905 Change-Id: If2b148d4ecc790182a7bcc56dd17a33c4ee16617 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Assistant: Fix an export and an import of bookmarksAlexander Volkov2015-03-063-4/+4
| | | | | | | | | | Use the correct root index for BookmarkModel. Allow to remove top-level bookmark folders if they were created by importing bookmarks. Task-number: QTBUG-44042 Change-Id: I423b141d0e64dec8c4cebfdba0d4401d575d1b96 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
* Fix warning in correct uses of QCoreApplication::translateAlbert Astals Cid2015-03-064-2/+17
| | | | | | | | It was emitting the warning for "Unsupported Latin1" in the case it was a valid plural form too Change-Id: I22c9c15d50488810e3ff5d7b132aebd994b08ebf Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Doc: Replace qt-project.org/doc with doc.qt.ioSergio Ahumada2015-03-063-3/+3
| | | | | | Change-Id: I9f17221f474e06be83a4d9e076746fa3db71d147 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix kmap2qmap build on OS XSamuel Gaist2015-03-051-3/+5
| | | | | | | | Currently kmap2qmap fails to build on OS X (clang) This patch aims to fix this. Change-Id: I61c985dc7ad1f2486368c39aa976599d274942ab Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update/add missing parts to build makeqpfSamuel Gaist2015-02-272-69/+91
| | | | | | | | In its current state makeqpf is not buildable. This patch adds the missing files as well as update the code to use version 2 Change-Id: Idd35a5db5edeef5523b588b919cebebfcdbeaa27 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Merge "Merge remote-tracking branch 'origin/5.4.1' into 5.4" into ↵Frederik Gladhorn2015-02-1010-14/+23
|\ | | | | | | refs/staging/5.4
| * Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-1010-14/+23
| |\ | | | | | | | | | Change-Id: Ibde5671a132665726e9a16cdb98bceb9717e45f3
| | * Merge 5.4 into 5.4.1v5.4.15.4.1Oswald Buddenhagen2015-01-167-35/+17
| | |\ | | | | | | | | | | | | Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a
| | * | qtdiag/Windows: Output GPU information similar to dxdiag.Friedemann Kleint2015-01-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-43263 Change-Id: I348a97a843bcfc2339a06f7408dea72e91d9e0d0 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| | * | Bump copyright year to 2015Kai Koehne2015-01-139-14/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I953d93b1e6d1cfe01374645fcb50746c91730eba Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | | Remove duplicate expression on both sides of '||'Sergio Ahumada2015-02-101-1/+0
|/ / / | | | | | | | | | | | | Change-Id: I09601b4ed4b5d9c9e3e373508f5413d0858bb414 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* | | linguist: Consistently wrap PO file lines to 79 charactersAlex Henrie2015-02-092-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the space character is not taken into account, some lines are given one extra character. This makes Qt Linguist wrap them differently from gettext and produce unnecessarily large diffs when editing files generated by gettext. Change-Id: I310d747a8f455d8ca47e882af04b081e9db25f69 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | MacDeployQt: Handle absolute pathsTim Murison2015-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly compute 'cdupCount' when macdeployqt is invoked on an absolute path. Task-number: QTBUG-42954 Change-Id: Id7939610dfb4468b59fcb9dafc2e5da2b578ddba Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* | | lupdate: update the description for -no-obsolete optionLiang Qi2015-02-021-1/+1
| | | | | | | | | | | | | | | Change-Id: I164744863d4e3949301ec1f236a76e4ce14decae Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | | macdeployqt: fix spelling errors in help informationLiang Qi2015-01-221-2/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-44034 Change-Id: Ie4337dc4770dbe542b3980c6d7265e651de0e88f Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Doc: linking issues qttoolsNico Vertriest2015-01-194-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Added qmake to qdocconf files Removed link to internal function Task-number: QTBUG-43810 Change-Id: Ic371681ddff95f09a31b305056997ff76e9c80f3 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Bump versionOswald Buddenhagen2015-01-161-1/+1
| |/ |/| | | | | Change-Id: Icaf21350a90d6d2568d76cec4cc1bd5a74eaca7d
* | generate_ui: make the generated code compile for uicMarc Mutz2015-01-152-12/+10
| | | | | | | | | | | | | | | | These includes should also work when compiled for designer. Change-Id: I1705e47f561589b0deec23dc773408835947c1fc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Doc: invalid links in linguistNico Vertriest2015-01-141-2/+2
| | | | | | | | | | | | | | | | Corrected link to qmake, removed link to lconvert Task-number: QTBUG-43779 Change-Id: Ieb5bbc0385764bbcff1305ae4f2f2377cf43f464 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Doc: corrected title Using LupdateNico Vertriest2015-01-120-0/+0
| | | | | | | | | | | | | | | | | | Corrected to "Using lupdate" Task-number: QTBUG-43537 Change-Id: I2edc7a2470f5652b7e0c97705d96ce7f461db6b8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | windeployqt: Update plugin directory-module associations.Friedemann Kleint2015-01-091-1/+5
| | | | | | | | | | | | Change-Id: I15d030b03a759aff3c6b0a3d2eb415684e635a07 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Remove unused functionsThiago Macieira2015-01-093-20/+0
|/ | | | | | | | | Found by Clang 3.6: assistant/main.cpp:97:1: warning: unused function 'updateUserCollection' [-Wunused-function] Change-Id: I3fe006504e848914f38b1c481de13b3d10d1059c Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* androiddeployqt: Remove unused variableEskil Abrahamsen Blomfeldt2015-01-061-2/+0
| | | | | | | | Just remove a dead variable assignment. Change-Id: I6034b8a5c462d30449ac7d02b6e6bc1dec109156 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* androiddeployqt: Don't bundle QML files in projectEskil Abrahamsen Blomfeldt2015-01-061-2/+17
| | | | | | | | | | | | | | | | | | | | Sometimes qmlimportscanner will generate dependencies on files local to the QML root path. This happens specifically when you have an import "../" in one of your files. Since the files in the input project are already installed in some way, we don't need to include them under assets, so we skip these files. [ChangeLog][Android] Fixed bug where androiddeployqt would automatically bundle some QML files in your input project along with their dependencies. Change-Id: I186df8213024100e5e9ee862eadb3ca568fa6dea Task-number: QTBUG-43573 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Doc: moved doc D-Bus Viewer from qttools to qtbaseNico Vertriest2015-01-021-16/+0
| | | | | | | | Inserted in patch 102784 into qtdbus-index.qdoc in qtbase Task-number: QTBUG-43537 Change-Id: I6142aabe7675dd401de950958d20952e63a3ee4b Reviewed-by: Martin Smith <martin.smith@digia.com>
* Assistant: Fix high CPU usage if a parent process finishesAlexander Volkov2014-12-221-1/+5
| | | | | | | | | | | | | If Assistant has been started in the remote control mode in Linux and it's parent process finishes, then Assistant increases CPU load to 100% and continuously raises it's window. It is because QSocketNotifier for stdin continuously emits activated() signal although there is no data to read. So disable the notifier after receiving EOF. Change-Id: I1b01108e1b97bc4fd54411b16489082be7f47bf4 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Assistant: Extract StdInListener class from RemoteControlAlexander Volkov2014-12-227-81/+236
| | | | | | | | | Also rename StdInListenerWin to StdInListener and select the needed version during compilation. Change-Id: I4ef45feee71bae47ef3dfb63e91b7e3154886006 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com> Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* Make sure we are using gradle 2.xBogDan Vatra2014-12-191-0/+16
| | | | | | | | | | | | Google is playing with my nerves! Android SDK Tools v24.0.0 set gradle 1.x by default, then in v24.0.1 they've switched to gradle 2.x. Incredibly, a few days later they're released v24.0.2 and again they've switched back to gradle 1.x as the default gradle version. Thought, when a project is opened in Android Studio, Android Studio switches to gradle 2.x. We'll do the same thing in androiddeployqt. Change-Id: Id5ca3f94a96b230cbb6af410bccf292d53f9ea5b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Solve warning about unused functionThiago Macieira2014-12-181-2/+2
| | | | | | | | | | | The function is unused, but gets used when developers are doing debugging. So instead of removing it completely, make it inline non-static. I've also moved it to a better place, so we don't forget about it. Change-Id: Id751869e6d6a7d46b4985ef9c09f45661e8cf839 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Remove workaround for RVCT compiler bugThiago Macieira2014-12-181-159/+0
| | | | | | | | | | We have no idea if anyone is still using that compiler. But let's assume that they are using a more modern version that does not have the same bug that we faced with Symbian in 2010. Change-Id: I1d25d05d6ecbf531d4942e696470db689c55eeea Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* work around MSVC2010 ICEOswald Buddenhagen2014-12-171-2/+2
| | | | | | | Task-number: QTBUG-43394 Change-Id: Ifffcc0cf9109b76d79f603a13792d7fd9979761c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> (cherry picked from qtbase/87eb3ea1904756362ce5474838b25b5b00193dc5)
* Make sure gradlew has exec permissions on *NIX systems.BogDan Vatra2014-12-171-0/+5
| | | | | Change-Id: Icfe2278bf697e4a2e342c6a1d16339bfa674acd4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Doc: Add install path for examplesTopi Reinio2014-12-163-0/+3
| | | | | | | | | | | Several documentation submodules were missing the correct install path in the doc configuration. This change will enable the examples to be listed under the Qt Creator Welcome mode. Change-Id: I15554d68f6a5c1741756ab4581050420ecd10cc2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Designer: Use QWidget::save/restoreGeometry() to position resource dialogs.Friedemann Kleint2014-12-162-6/+8
| | | | | | | | | | Using QRect as was done before might cause the dialogs to be restored out of screen if a screen is removed from a multimonitor setup. Task-number: QTBUG-43374 Change-Id: I48bb6e747da8042a8433d26e5e3bed267126ed3b Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
* Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | Change-Id: Ie1e2dd433215df1037accc0cef807b009272a40c
* Android: Don't bail out if qmlimportscanner is missing.Christian Strømme2014-12-091-1/+1
| | | | | | | | If the qmlimportscanner is missing, just print the warning and continue, as it's most likely that the application is a non-qml application. Change-Id: Ice8b4f11df3df558555fbd3ac373561ce6fb4896 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Revert "Revert "Revert "Qt Designer: Temporarily disable loading of ↵Friedemann Kleint2014-12-091-8/+0
| | | | | | | | | | | | | | QDeclarativeView plugin." Re-enable the QDeclarativeView plugin. This reverts commit a60aa90f5ca00e32a1271a476f5da650dddebfda. Task-number: QTCREATORBUG-10273 Task-number: QTCREATORBUG-13616 Task-number: QTBUG-35006 Change-Id: Id8c34e040508f7509501533eceaa75613a46baa8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Designer: Do not filter out wheel events on form containers.Friedemann Kleint2014-12-021-0/+4
| | | | | | | | | Otherwise, scrolling with the mouse wheel over the form no longer works. Task-number: QTBUG-42927 Change-Id: Ib9022bd3c8e158ca10965602c134415c5c4f7039 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-270-0/+0
|\ | | | | | | Change-Id: Icb5b56853c52d51d2cbb294ce9abb5450e2fa2d4
| * macdeployqt: Also deploy framework's Libraries and Helpersv5.4.05.4.0Jocelyn Turcotte2014-11-211-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebEngine can't put all its external data in qrc files and have a few files lying around in the Qt installation. To allow it to be bundled with applications, those files are now placed into the QtWebEngineCore framework. This patch allows Helpers/QtWebEngineProcess.app as well as Libraries/ffmpegsumo.so to be deployed when macdeployqt is run on an application linking to QtWebEngine. This link mention that Libraries is a standard directory: https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html This link mention that Helpers is a standard directory for application bundles, but I haven't seen any mention regarding frameworks: https://developer.apple.com/library/mac/technotes/tn2206/_index.html Task-number: QTBUG-41611 Change-Id: I27f662747bd3dff4b9fc8706ecbd2f16f057e857 (cherry picked from commit 5984871db094182b89d2b8e0b142817b227afa4d) Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Remove unused private membersThiago Macieira2014-11-242-5/+1
| | | | | | | | | | | | | | | | | | Found by Clang 3.6: messageeditorwidgets.cpp:250:14: warning: private field 'm_wrapee' is not used [-Wunused-private-field] cpp.cpp:309:15: warning: private field 'yyInteger' is not used [-Wunused-private-field] Change-Id: Ice6aa515123b1ac375816271362772d50b9b8f27 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Fix silly taking of address when not intendedThiago Macieira2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | We meant to pass the boolean itself, noting whether the property had changed, not the address of the boolean, cast to a bool. Found by Clang 3.6: qlayout_widget.cpp:421:147: warning: address of 'this->m_fieldGrowthPolicyChanged' will always evaluate to 'true' [-Wpointer-bool-conversion] Change-Id: I8a7db0d0cf02b88043f905333e119a8fb799ea53 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-2129-2/+15
|\ \ | |/ | | | | Change-Id: If7b9ae7b6f77025c775e6b654837b5f041f1aab9
| * New Qt logov5.4.0-rc1Alessandro Portale2014-11-2027-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch replaces the old Qt logo with the new, flatter one. The PNGs were optimized via: optipng -o7 -strip "all" src/assistant/assistant/images/qt-logo.png was deleted since it is unused. Task-number: QTBUG-41685 Change-Id: Id04972f87135e15c41d52c5e9f00ad4944d8d1f6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * windeployqt: Deploy translation files of the QtWebEngine module.Friedemann Kleint2014-11-121-1/+10
| | | | | | | | | | | | Task-number: QTBUG-42083 Change-Id: Ibc52780c52399ba13cfa5c501b67bd37ea727d1f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
| * QHelpContentModel: Fix that the model sometimes ended up emptyEike Ziller2014-11-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | When aborting collecting the content items, sometimes the "abort" state was not cleaned up correctly, so the next run thought it was aborted too. If that happened at the end of the multiple start/abort cycles that happen at initialization, the content model ended up empty. Task-number: QTCREATORBUG-13233 Change-Id: Ia47a6b033cc3fd1f7a02d5194fb6f7ea68a435c5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | macdeployqt: Also deploy framework's Libraries and HelpersJocelyn Turcotte2014-11-131-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebEngine can't put all its external data in qrc files and have a few files lying around in the Qt installation. To allow it to be bundled with applications, those files are now placed into the QtWebEngineCore framework. This patch allows Helpers/QtWebEngineProcess.app as well as Libraries/ffmpegsumo.so to be deployed when macdeployqt is run on an application linking to QtWebEngine. This link mention that Libraries is a standard directory: https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html This link mention that Helpers is a standard directory for application bundles, but I haven't seen any mention regarding frameworks: https://developer.apple.com/library/mac/technotes/tn2206/_index.html Task-number: QTBUG-41611 Change-Id: I27f662747bd3dff4b9fc8706ecbd2f16f057e857 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
View Lorry Controller Status