summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* Remove the Qt Designer arthurplugin example.Friedemann Kleint2014-10-276-354/+0
| | | | | | | | The example accesses code from the qtbase, which does not work. Task-number: QTBUG-28147 Change-Id: I842080eee5b0ea5ed1da6a4e08ae3d6e9f9ead5f Reviewed-by: Alex Blasche <alexander.blasche@digia.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
| | | * Update copyright year in About dialogsv5.3.25.3.2Kai Koehne2014-09-044-8/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I4c911c809c3779f7ac59917d5d88a38628817f67 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | | uic: don't use QStringLiteral in comparisonsMarc Mutz2014-10-143-285/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QLatin1String, operator== is overloaded, even for QStringRef, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: Ice92d40342cb3939e8697d3f778f4421f5f967a1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | | generate_ui: adapt to upstream change in qtbaseMarc Mutz2014-10-142-9/+8
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 106487387d493dab934e19b33bfed55b8df62d67 in qtbase removed a few ? true : false, some of them happened to be in uic's generated code. Adapt the generator. Change-Id: I1c5aefef57e3d17aaef3c1eee4ce92730499b4df Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Assistant: Fix index updating on startup in the remote control modeAlexander Volkov2014-10-131-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HelpEngineWrapper::initialDocSetupDone() should be called only once right after the initialization of the help models. Calling it on every small update leads to recursion. Task-number: QTBUG-36850 Change-Id: I16cae03f08bbc9a19ec9298c84c602a4046dce93 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* | | Update copyright year in "About" dialogs to 2014.v5.4.0-beta1Friedemann Kleint2014-10-094-8/+8
| | | | | | | | | | | | | | | Change-Id: Ia9807bc783d3f83ab1556faeb3fa73af3be4505d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | uic4: update sources from current generate_uiMarc Mutz2014-10-092-63/+66
| | | | | | | | | | | | | | | Change-Id: I4fa0490162fdef4b65ce8fccea731810262e6a97 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Android: Support recursive ANDROID_DEPLOYMENT_DEPENDENCIESEskil Abrahamsen Blomfeldt2014-10-081-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The convenience of ANDROID_DEPLOYMENT_DEPENDENCIES would be greatly increased if you could include a directory and have its contents be added recursively to the deployment, instead of listing each file individually. Change-Id: I3cf3248007369122ea6ba98ab79f7f2f951a26c3 Task-number: QTBUG-41674 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | | macdeployqt: fix checking for existing deployed files.Jake Petroules2014-10-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I53c44256e33f3b5d7db93b4765308335a11e8ecd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | windeployqt: Add support for QtWebEngine.Friedemann Kleint2014-10-061-12/+54
| | | | | | | | | | | | | | | Change-Id: I92d8d5271c0dc53cc37ea6f699e75ab91ad0cf3a Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | | Qt Designer: Load translations only when designer_<LANG>.qm is present.Friedemann Kleint2014-10-061-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | Try to load designer_<LANG>.qm first and load qt_<LANG>.qm only if the former succeeds. Task-number: QTBUG-41790 Change-Id: Id4862019edf81da81bf9d059c586bbfee18ab7e6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | windeployqt: Use Qt5Gui.dll to detect ANGLE/OpenGL.Friedemann Kleint2014-10-031-18/+24
| | | | | | | | | | | | | | | | | | | | | | | | After the introduction dynamic GL loading, the platform plugin no longer directly depends on the GL libraries. Change-Id: Icd3a5836fff52071df33a5ad87dea528c11ee83c Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | Qt Designer: Add QOpenGLWidget.Friedemann Kleint2014-09-292-0/+21
| | | | | | | | | | | | | | | Change-Id: Ia20e63c1427af954c04d0a6c384802fabc2e7bfd Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | windeployqt: Deploy software rasterizer for dynamic Open GL builds.Friedemann Kleint2014-09-261-8/+10
| | | | | | | | | | | | | | | Change-Id: I0bb260c7c8992ae24dda6f84eaf304329eb4159c Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | Removed run-time library for the QML compilerSimon Hausmann2014-09-261-5/+3
| | | | | | | | | | | | | | | | | | | | | This library is not needed anymore for the release with Qt 5.4 Change-Id: Ia3e361405f73f2f3da025475aa440c8b93398850 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Improve how macdeployqt calls qmlimportscannerMorten Johan Sørvig2014-09-261-5/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Construct the argument list using "-rootPath", which correctly handles multiple qmlDirs. Don't merge qmlimportscanner stdout and stderr. Log stderr as macdeployqt warnings. Change-Id: I6f82f90f4e242c9aa246ab26ba3b9af88e1fd123 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | | Update license headers and add new license filesAntti Kokko2014-09-251027-19633/+11308
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* | | Zoom the documentation according to the system DPI by defaultJocelyn Turcotte2014-09-242-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtWebKit follows the web standard use of 96 DPI for font sizes and this is a good compromise for the web, but this would require each Assistant user to zoom the text manually without the benefit of keeping existing content working (since we don't show any external content in Assistant that could break with a higher DPI). HiDPI on OS X already handles the issue by scaling the whole page by two, but since we don't completely support DPI awareness on Windows, Assistant assets and text will be scaled but the documentation itself will be microscopic. Use the zoomFactor to adjust the DPI according to system settings by dividing QScreen::logicalDotsPerInch() by 96. Task-number: QTBUG-41076 Change-Id: I5644d0b383fcaf04bed156207afca9b322ea18a6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | | Qt Designer: Fix range check of double properties.Friedemann Kleint2014-09-241-1/+1
| | | | | | | | | | | | | | | Change-Id: I18348c0e354a8dd9306d40557700e34225c21014 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | | qdbusviewer: Extract MainWindow classAlexander Volkov2014-09-246-54/+174
| | | | | | | | | | | | | | | | | | | | | | | | This refactoring is a preparation for saving/restoring window settings. Change-Id: I22b4c4947437e90f986390a4dd7c14d50a0f02d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Make sure the outputDirectory contains the full path not relative.BogDan Vatra2014-09-221-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to run a process using the relative path on windows fails. Task-number: QTBUG-41431 Change-Id: I0c9aa837dc7a556372b1018feb2f7f5c14c2652a Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | | Don't remove assets folder.BogDan Vatra2014-09-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | The user might copy files in assets folder at install time. Change-Id: Ib26f6d0546aae70788c09bf455835647e3deb602 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: BogDan Vatra <bogdan@kde.org>
* | | Qt Designer QDesignerContainerExtension example: Fix page title.Friedemann Kleint2014-09-222-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tie the setting of the combo title to QQWidget::windowTitleChanged(). The call to retranslateUi() happens after adding the pages; so the titles are lost in uic-generated code. Change-Id: Ia88dd694a7ab5fe1bd62a849feeb7768a2ba6f16 Task-number: QTBUG-24916 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* | | Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Frederik Gladhorn2014-09-182-5/+6
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-162-5/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I32718899f94175b7012ac5ba208fc18eb54b3ae9
| | * | fix context checkmarksOswald Buddenhagen2014-09-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not such a good idea to not count finished messages towards non-obsolete ones. amends 9d3cbd0a. Task-number: QTBUG-34921 Change-Id: I22d0dd14c094a33973635c23e59c66d72c6c746a Reviewed-by: hjk <hjk121@nokiamail.com>
| | * | remove pointless empty column in message listOswald Buddenhagen2014-09-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the view has one column less than the context list, so reflect that in the model. Change-Id: I51c87167bc334b47e4a35874a476823db4908790 Reviewed-by: hjk <hjk121@nokiamail.com>
View Lorry Controller Status