summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright headersAntti Kokko2015-02-141018-6381/+6357
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* androiddeployqt: Always include platform plugin dependenciesEskil Abrahamsen Blomfeldt2015-02-101-11/+3
| | | | | | | | | | | | Qt DBus recently became a dependency for the platform plugin, causing applications to crash on startup when this is missing. Instead of special casing the GUI dependency, we always add all dependencies of the platform plugin. Change-Id: I59d71531f60874ce436af1840656974d58c14661 Task-number: QTBUG-44182 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Revert "fix catalan plural rules"Alex Henrie2015-02-091-7/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit f1e471b561012f90938766c00aefff417593e71f. I could not find any evidence that any dialect of Catalan has more than two plural forms, nor could I find any other software project that gives Catalan more than two plural forms. I personally have never heard or seen more than two plural forms used in spoken or written communication. The CLDR seems to agree with this. [ChangeLog][Linguist][Important Behavior Changes] The plural rules for Catalan have been fixed, which will invalidate any existing translations with plurals. Change-Id: Id71639a75ec970ee3079b468c2628ced710c1c3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Henrie <alexhenrie24@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-1918-297/+292
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifdb0e36fde8a63e1a768f1c876521e908810244d
| * 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>
| * 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>
* | Add qtplugininfo, a tool to dump plugin meta data.Volker Krause2015-01-123-1/+85
| | | | | | | | | | | | | | | | | | This is useful when debugging plugin loading issues, especially also when adding additional custom meta data as it's done by e.g. KDE and GammaRay. Change-Id: Ib1d5d1f663f1330a263fc3758b98245b388b31f6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | windeployqt wince adaptionsBjoern Breitmeyer2015-01-122-1/+4
| | | | | | | | | | | | | | Let windeploy Qt support wince. Change-Id: I1835f45e93c1d433b41d78dba8b91ac7be2307c5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Fix build after commit 9d7b27f5bf44a46707e6d50ebf51ecf73f91dd1b in qtdeclarativeSimon Hausmann2015-01-121-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | The commit integrates the .pragma and .import parsing in JavaScript files directly into the lexer. Previously the QML engine had a separate function for parsing those directives and replacing them with whitespace in the source. Similarly the code here tried to do the same. Fortunately this is not necessary anymore as the lexer now understands those directives and unless told otherwise will simply ignore them. Change-Id: If9888deb2c82a15d1727f4254d897fc9e7bcb832 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Replace Q_STATIC_GLOBAL_OPERATOR with staticThiago Macieira2015-01-081-3/+1
| | | | | | | | | | | | | | | | | | | | This existed only for working around an RVCT compiler bug. Let's assume anyone still using that compiler has upgraded to a version that has the bug fixed. Change-Id: Iee4e39893b68ea3f8a8d158229a93e741069b617 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | Add missing includes.Friedemann Kleint2015-01-076-0/+8
| | | | | | | | | | | | | | | | After qtbase/90e7cc172a7521396bb2d49720ee4ceb9a9390b3, QStringList no longer includes QDataStream. Change-Id: Ib10622b0da3b3450d29fc65dc5356fde75444a8f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Remove qBinaryFind usage from Qt Assistant.Alexander Volkov2015-01-061-6/+3
| | | | | | | | | | | | | | | | | | | | It was omitted in commit 49998cea897fa4c5d410ce07bd53f0d1ee0fd180 (QtAlgorithms is getting deprecated). Also remove the overload of operator<() which becomes unused with std::lower_bound(). Change-Id: Iaee3c464e3107c8c3c34def9fa762f22dbd8d510 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2014-12-299-17/+23
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-12-179-17/+23
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ifbda2445e6665d66a1372f6c0a2d0a1c30ae029d
| | * 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>
| | * 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>
* | | Remove qtconfig from the repository.Dmitry Shachnev2014-12-2418-3993/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | We are not going to build/ship it, anyway. http://lists.qt-project.org/pipermail/development/2014-December/019545.html Change-Id: Iad58f384550b2379faebc9542baf94459204c175 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | | windeployqt: Put translations into subdirectory "translations".Friedemann Kleint2014-12-181-6/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Add translationsDirectory member variable defaulting to target + "/translations" (matching the default location of qt.conf) to options and put Qt's and WebEngine's translations there. [ChangeLog][Important behavior changes][windeployqt] windeployqt now puts translations into subdirectory "translations". Task-number: QTBUG-43351 Change-Id: Ib1173f9dd7ca029d9dcb58c89a53bba43b22ec99 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | qdbusviewer: Restore the window size and state on startupAlexander Volkov2014-12-125-4/+81
| | | | | | | | | | | | | | | | | | Save the window size, maximization state and state of splitters on exit and restore these settings on startup. Change-Id: Ibe26b09cc97ffc2fef17e6e8e2b804324dae7002 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Assistant: Introduce DEFINES per browser type.Friedemann Kleint2014-12-0910-44/+57
| | | | | | | | | | | | | | | | | | | | This makes it easier to add additional browser types and switch between browsers. Task-number: QTBUG-41130 Change-Id: I88e2890bfe9e815ed7deb9d867060f244b7e2a45 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alejandro Exojo Piqueras <suy@badopi.org>
* | Assistant: Factor out web browser support.Friedemann Kleint2014-12-094-130/+315
| | | | | | | | | | | | Task-number: QTBUG-41130 Change-Id: Ia1d29b6eaa56e0f9eb569326e05f4c56411db6a7 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-2732-8/+17
|\ \ | |/ | | | | Change-Id: If3345bc6090bac3cddf98c6eed68f47686a3ee75
| * 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>
* | | Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2014-11-198-63/+147
|\ \ \ | |/ / | | | | | | Change-Id: I3492eb21cb47e2a77dc5a79b3ddab8522ac39fea
| * | 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>
| * | Tolerate an empty android-extra-libs valueAleix Pol2014-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Skip the empty fields in the split. It's obvious that "" means nothing, there's no other way to read the value. It especially helps with machine-generated versions of the json files. Change-Id: Idb957d4fa3076e908e5f437807b171f6ec56863c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * | androiddeployqt: Add --qml-import-paths to help outputEskil Abrahamsen Blomfeldt2014-11-101-0/+2
| |/ | | | | | | | | | | | | | | This option should also be documented. Change-Id: Icbcbaea65c839105c8f5a94b5d391bb9e95479ce Task-number: QTBUG-41494 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| * Q_ASSERT now always expands the argumentThiago Macieira2014-11-011-2/+0
| | | | | | | | | | | | | | We need isDescendant to be defined. Change-Id: I014c0501d11613c252c3bf2297442e2693708b5e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * windeployqt: Add option to skip qmltoolingAndrew Knight2014-10-311-2/+7
| | | | | | | | | | | | | | | | These plugins should be left out when creating release packages, so add the option to disable them. Change-Id: Ic40f861c5c01534aa95a39fca398946eedbb4688 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * windeployqt: Accept a list of positional arguments.Friedemann Kleint2014-10-291-19/+45
| | | | | | | | | | | | | | | | | | | | | | The first argument can be either a binary or a directory containing the binary. Further arguments can be either libraries or directories containing libraries (plugins). Task-number: QTBUG-41670 Change-Id: I48dd157f6404118400948ef019016c2aa6661762 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
View Lorry Controller Status