summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge 5.4 into 5.4.1v5.4.1Oswald Buddenhagen2015-01-167-35/+17
|\ | | | | | | Change-Id: Id1f12a225d975ba3a2c244e90c00126b9e90368a
| * 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>
* | 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-137-12/+12
|/ | | | | Change-Id: I953d93b1e6d1cfe01374645fcb50746c91730eba 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>
* 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 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>
* | 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>
* windeployqt: Add --release-with-debug-info option..Friedemann Kleint2014-10-295-34/+64
| | | | | | | | | | | | | | The option can be used for Qt builds with -force-debug-info -release . For those, deployment fails with "Unable to find the platform plugin." since the DLLs are detected as debug-built. If windeployqt is extended to actually read Qt configuration information, the value can be obtained from there. Task-number: QTBUG-42072 Change-Id: If8b4a0e41821b5f0f4b7023b1b9a3d49e50628a1 Reviewed-by: Jarred Nicholls <jarred.nicholls@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* androiddeployqt: Fix dependency order for XML dependenciesEskil Abrahamsen Blomfeldt2014-10-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Although this bug was there in Qt 5.3 as well, something has changed in our build system that causes readelf to return libraries in a different order than before. In particular, the QtMultimedia dependency is now listed before QtQuick if it's listed first in the QT variable in the .pro file. This caused the following bug: When we read the manual dependencies from the XML specification, then we assume the dependencies of these are already met (otherwise they should not be added). Therefore, we need to load these dependencies last, not intermingled with the actual direct dependencies of the application. What would happen is that Qt5Multimedia came before Qt5Quick, and triggered adding Qt5MultimediaQuick_p before Qt5Quick. This of course depends on Qt5Quick so it needs to be added after it (which is why it is only added if the application itself depends on Qt Quick). Change-Id: Ifa97d85645cff49ebf65d4ce3fc2101506346695 Task-number: QTBUG-42012 Reviewed-by: Christian Stromme <christian.stromme@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* windeployqt: Make check for Qt modules more discriminative.Friedemann Kleint2014-10-271-3/+7
| | | | | | | Qt Creator's QtcSsh.dll is not a Qt module. Change-Id: I3349724a5d64d1662480d053369768fbbd54b3bc Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* windeployqt: Add missing include.Friedemann Kleint2014-10-201-0/+1
| | | | | Change-Id: Id309f777a04b03fc9db099477fe83d4d80bfe495 Reviewed-by: David Schulz <david.schulz@digia.com>
* Assistant: prevent the main window from jumping during startupAlexander Volkov2014-10-171-4/+0
| | | | | | | | Remove the 6 year old hack which causes an early show of the main window. Change-Id: I1c8d782b3ecd7278068b5a21d34fef937585f25d Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Assistant: Make "Bookmarks Menu" the default bookmarks folderAlexander Volkov2014-10-161-2/+1
| | | | | | | | | | Assistant doesn't show the bookmarks toolbar by default so it's more reasonable to preselect the "Bookmarks Menu" folder when a user adds a bookmark. Change-Id: If1b92c1decb280e96e5c58a56d6948eec6e44813 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-10-168-63/+331
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-148-63/+331
| |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/assistant/mainwindow.cpp src/linguist/linguist/mainwindow.cpp src/qdbus/qdbusviewer/qdbusviewer.cpp Change-Id: I1f5524ab747be561ed0b13d8b1fd8cb51a890363
| | * Make sure the content widget never replaces valid data with empty data.5.3Christian Kandeler2014-10-061-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This could happen because insertContents() is called once for every run of the content provider, even if an invalidation happens in between. Example sequence: run() invalidate() [removes result of first run] run() insertContents() [queued for first run, retrieves result of second run] insertContents() [queued for second run, retrieves empty data] We now check in insertContents() whether the content provider has a valid root item and do nothing if it does not. This means that insertContents() will never replace the current model data with empty data; only invalidateContents() can do that from now on. Further improvements: - Only call insertContents() if the run was not aborted; this reduces the number of useless objects in the event queue. - Remove the m_rootItem member; it was only used in the run() function. - Only add the root item to the list at the end of a successful run; there is no reason this object should be accessible from the outside while there are still children being added to it. Change-Id: I80e2ea93dd9bbc8ab7f406c989b61f16f11b6eea Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| | * Prevent re-deploying already deployed imports.Morten Johan Sørvig2014-10-011-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Check if the target directory exists before copying the import. Change-Id: Id729f26b4b887c7a3b209aa88649eca3fc73b0ba Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Work around legacy framework structures.Morten Johan Sørvig2014-10-011-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Existing versions of qmake produce application bundles which are incompatible with OS X code signing. Deploy framework Info.plist files to the correct location. Patch them to remove any "_debug" suffix on the value for CFBundleExecutable. Task-number: QTBUG-32896 Change-Id: Id657e394f3bf919713a43e395e716bf46488c644 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Make deployed Qt Quick imports code signableMorten Johan Sørvig2014-10-011-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OS X code signing process enforces strict code/data separation. Split up the Qt Quick imports; deploy .dylibs to "Contents/Plugins/quick/", deploy .qml files and other resources to "Resources/". Create symlinks to the dylibs so that Qt Quick can load the imports as usual. Task-number: QTBUG-34810 Change-Id: If7e1f80b357598c8e3cc7dd46a9363387218d541 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Add -codesign option.Morten Johan Sørvig2014-10-013-1/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the "codesign" tool with the provided signing identity to sign all code binaries in the bundle. Application code binaries include the app executable(s), plugin and framework/dylib dependencies. Finally, run "codesign --verify" to verify that the app bundle is correctly signed. Change-Id: Idfff030a2b218e1dc1ad1bc279a32a330665b347 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Fix framework bundle deploymentMorten Johan Sørvig2014-10-012-44/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rework copyFramework(). Split out dylib deployment into copyDylib(). Remove the special symlink handling. Always create symlinks from "Current" to the actual version. This ensures we're compatible with Apple's framework bundle spec [1]. It also makes the 'codesign' utility happy, easing the step to sandbox Qt OS X applications. [1]: https://developer.apple.com/library/mac/documentation/ macosx/conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html Task-number: QTBUG-32896 Change-Id: Ide23437c9bb6515d5013d37ae6ff4133a69085ad Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Fix crash when accessing the content model.Christian Kandeler2014-09-194-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Make sure invalidateContents() is called whenever the help engine's DB readers are destroyed. 2) In QHelpContentProvider::stopCollecting(), remove all root items, as they are invalid now: Their child items reference DB readers that are going to be destroyed. Task-number: QTBUG-18829 Change-Id: Id9cc4ea99c43c36ad5c5d1f04157a68bac79d44a Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
| | * Merge remote-tracking branch 'origin/5.3.2' into 5.3Frederik Gladhorn2014-09-174-8/+8
| | |\ | | | | | | | | | | | | Change-Id: I75765dd8b4ebe39933da89933df1d61ae209e0cd
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 07:47:44 +0000