aboutsummaryrefslogtreecommitdiffstats
path: root/dist
Commit message (Collapse)AuthorAgeFilesLines
* Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"v5.6.2Sze Howe Koh2016-06-191-1/+1
| | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I0bcedfe10dfbbf301b128d3bf5247452a531f199 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/1.1' into '1.2'v1.2.0-beta1v1.2.0Frederik Gladhorn2015-03-312-0/+53
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf LICENSE.LGPLv21 LICENSE.LGPLv3 src/enginio_client/chunkdevice_p.h src/enginio_client/enginio.h src/enginio_client/enginiobackendconnection.cpp src/enginio_client/enginiobackendconnection_p.h src/enginio_client/enginiobasemodel.h src/enginio_client/enginiobasemodel_p.h src/enginio_client/enginioclient.cpp src/enginio_client/enginioclient.h src/enginio_client/enginioclient_global.h src/enginio_client/enginioclient_p.h src/enginio_client/enginioclientconnection.h src/enginio_client/enginiodummyreply.cpp src/enginio_client/enginiodummyreply_p.h src/enginio_client/enginiofakereply.cpp src/enginio_client/enginiofakereply_p.h src/enginio_client/enginioidentity.cpp src/enginio_client/enginioidentity.h src/enginio_client/enginiomodel.cpp src/enginio_client/enginiomodel.h src/enginio_client/enginiooauth2authentication.h src/enginio_client/enginioobjectadaptor_p.h src/enginio_client/enginioreply.cpp src/enginio_client/enginioreply.h src/enginio_client/enginioreply_p.h src/enginio_client/enginioreplystate.h src/enginio_client/enginiostring.cpp src/enginio_client/enginiostring_p.h src/enginio_plugin/enginioplugin.cpp src/enginio_plugin/enginioplugin_p.h src/enginio_plugin/enginioqmlclient.cpp src/enginio_plugin/enginioqmlclient_p.h src/enginio_plugin/enginioqmlclient_p_p.h src/enginio_plugin/enginioqmlmodel.cpp src/enginio_plugin/enginioqmlmodel_p.h src/enginio_plugin/enginioqmlobjectadaptor_p.h src/enginio_plugin/enginioqmlreply.cpp src/enginio_plugin/enginioqmlreply_p.h tests/auto/common/common.cpp tests/auto/common/common.h tests/auto/enginioclient/tst_enginioclient.cpp tests/auto/enginiomodel/tst_enginiomodel.cpp tests/auto/files/tst_files.cpp tests/auto/identity/common/identitycommon.h tests/auto/identity/oauth2authentication/tst_oauth2authentication.cpp tests/auto/notifications/tst_notifications.cpp tests/auto/qmltests/tst_enginioclient.qml tests/auto/qmltests/tst_enginioreply.qml tests/auto/qmltests/tst_files.qml tests/auto/qmltests/tst_identity.qml tests/auto/qmltests/tst_model.qml tests/auto/qmltests/tst_qmltest.cpp tests/auto/qmltests/tst_query.qml Change-Id: Icb6a167ba58b41e1a8e4d2c8f78213eae9472864
| * Merge "Merge remote-tracking branch 'origin/1.0' into 1.1" into refs/staging/1.1Jędrzej Nowacki2014-08-291-0/+22
| |\
| | * Add change log for Enginio 1.0.6Jędrzej Nowacki2014-08-201-0/+22
| | | | | | | | | | | | | | | Change-Id: I25977953c626da6f81bb8eac575321ddaa84a3c3 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
| * | Add Enginio 1.1 changelogJędrzej Nowacki2014-08-291-0/+31
| |/ | | | | | | | | Change-Id: Ice7e20e923ecc71edfd75d309321ec0b3ab001dd Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Fixed enginio license headers & filesJani Heikkinen2015-03-183-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated license from old LGLP to new LGPL21 in README.md dist/packages/com.digia.enginio/meta/installscript.qs dist/packages/com.digia.enginio/meta/package.xml dist/packages/com.digia.enginioDocumentation/meta/installscript.qs Removed unused LICENSE.GPL & LICENSE.LGPL Added missing LICENSE.LGPLv21 & LICENSE.FDL Task-number: QTBUG-45042 Change-Id: If7f092a9717a9d2ccb163def785f2cd5c25182d7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | Update copyright headersAntti Kokko2015-02-176-21/+21
|/ | | | | | | | | 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: I3af24310387050e692210e28566d4d4220773f06 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Add change log file for 1.0.5 versionJędrzej Nowacki2014-06-221-0/+22
| | | | | | | Change-Id: If6f6e0e8020ec9011382d1ebb2c6c920602c79df Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add changelog file for 1.0.4 versionJędrzej Nowacki2014-04-301-0/+23
| | | | | | Change-Id: Id770b46babf6cd5ba25d658b6f3f86736c137cde Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Create changelog file for 1.0.2 releaseJędrzej Nowacki2014-01-211-0/+4
| | | | | Change-Id: I056d1d14398e6feb99da2de7fb145ed5afb26bd6 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add missing change log file for 1.0.1 Enginio versionJędrzej Nowacki2014-01-081-0/+5
| | | | | Change-Id: I602010a0ae7e92883a4ac90f145b113a48331897 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Update changelogJędrzej Nowacki2013-12-051-2/+11
| | | | | Change-Id: Idfd9db257ab8962c44d3adaa5394c9739b73be58 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Cleanup old changelogsJędrzej Nowacki2013-11-297-0/+63
| | | | | Change-Id: I5576fb46fad539c2cf4c09514fb1b90d7560040f Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Add changelog for 1.0.0Frederik Gladhorn2013-11-191-0/+38
| | | | | Change-Id: Ib036a5613a9e65178d935aedc44bb11285f9926f Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Only set RequiresAdminRights on WindowsAndras Becsi2013-09-032-1/+9
| | | | | | | | | This prevents Linux and Mac to ask for the admin password event if it is not needed. We only want elevated permissions on Windows for now. Change-Id: I68481104dd9bf6d54665cf80839f427a890237c1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Patch the dependent paths on Linux tooAndras Becsi2013-09-033-28/+51
| | | | | | | | Adapt the patcher script to work on Linux too, and add additional files that need path adjustment after installation. Change-Id: Id87d9da403131c76f8862757a3587aad413eeb3b Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix the create_installer script to work with python3Andras Becsi2013-09-031-2/+2
| | | | | | | | With python3 there was an error because of type mismatch: "TypeError: Can't convert 'bytes' object to str implicitly" Change-Id: Icd552a72051c6d9892a1151bc91b42c05acc2afc Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Create distributable installer on MacAndras Becsi2013-09-023-0/+125
| | | | | | | | | | Remove all the hardcoded paths to the local Qt installation and patch everything in a post-install step so that the paths point to the actual Qt installation. This should create proper installer packages on Mac. Change-Id: I0c3e1c9ff12b7eb5d082a2aad2e47074bd69f585 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Improve the output of create_installer.pyAndras Becsi2013-09-021-2/+2
| | | | | | | | Build the sources with silent option and do not swallow the stdout so we see what happens during the package build. Change-Id: I0008c91bc9222fcf46e4dcd5e7e8736d49a3f329 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix package creationAndras Becsi2013-08-311-3/+4
| | | | | | | | | | | | | | | We did not actually pack the libraries we modified into the package but the ones found in the root build dir, thus it is a mystery to me how the Linux packages worked without the fixed rpath libs... Change the precedence so that we pick up everything in dist/build and only fall back to the root build dir if the given path does not exist. Additionally preserve symlinks when packaging since on Mac the frameworks have multiple symlinks to point to the correct version of the library. Change-Id: Id1a44c21eb8846ac2dfc3f27c60a82b7327f35fa Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix rpath value on LinuxJędrzej Nowacki2013-08-301-2/+2
| | | | | Change-Id: Ie052268ac98042a6fb721f24fbd1920724e5bbf1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix rpath value on LinuxJędrzej Nowacki2013-08-301-1/+1
| | | | | Change-Id: I3858ed515bbdd35e9758a5337214e6f9bcb1b845 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Bump enginio client version to 0.6.0Jędrzej Nowacki2013-08-304-8/+8
| | | | | Change-Id: If7bfa2051de1fb873c60049b742d0627578b9264 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix rpath on linuxFrederik Gladhorn2013-08-301-0/+7
| | | | | | | | This fix is not perfect (hard-coded paths) but certainly good enough for the current release. Change-Id: If7c443da25ba1e8dbdd4f6836a08a464e795a94f Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Create start menu entries on windowsFrederik Gladhorn2013-08-303-2/+67
| | | | | Change-Id: If54435630c0e5d583178f17622ddb2613bbdaa19 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Move dlls to bin dir on windowsFrederik Gladhorn2013-08-301-3/+13
| | | | | Change-Id: Ica07c04d3dcb67e62168978b2c801892aec78146 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Let docs be part of installerFrederik Gladhorn2013-08-291-2/+2
| | | | | Change-Id: I84c04a4bddfe822159c1d827be3ce9f3734406d1 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Only elevate installer privs on WindowsFrederik Gladhorn2013-08-291-4/+4
| | | | | Change-Id: I3d1774419a315b1e3017916751e3719dd2ed1b10 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Improve create_installer.pyAndras Becsi2013-08-271-1/+5
| | | | | | | | Also append compiler information to installer package name, and create a dmg disk image of the installer on Mac. Change-Id: I03a9eaf6cba4754f0c903b3f6eeaf4ad89466d7d Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Fix the wildcard for the qmake selection dialogAndras Becsi2013-08-261-1/+1
| | | | | | | | On Mac the qmake binary can not be selected from the dialog if the path does not match the wildcard. This is safe on Linux too. Change-Id: I1f60d69f745f71f664ecd4dd461031061bfed9f9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Add missing RequiredAdminRights tag to package.xmlAndras Becsi2013-08-261-0/+1
| | | | | Change-Id: Ie5ca507470a8f504e33da510137cc728039646b9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Do not use addElevatedOperation on MacAndras Becsi2013-08-261-1/+6
| | | | | | | On mac the privilege elevation is automatic. Change-Id: Ic4e7139d63e51aca178126872acaa3411f982db5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Update README of the installerAndras Becsi2013-08-261-1/+1
| | | | | | | | Configure options -qt-sql-sqlite and -no-c++11 are also needed when configuring the static Qt needed for the installer. Change-Id: I80d059d714e4eebb9362c2f1fc944d0c178f9a43 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Explicitly specify that we want to create offline installersAndras Becsi2013-08-261-1/+1
| | | | | Change-Id: I9ac8d796b16603492b4175b40ea0fc9e8f19bfce Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Use elevated operation in installerFrederik Gladhorn2013-08-221-1/+1
| | | | | | | | This means we can install with root rights since the Qt installer for example may be used to install Qt to c:\qt\... Change-Id: Ie7920c9ad69996766242b4671caa2901d76e291e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Let the user select qmake when running the installerFrederik Gladhorn2013-08-212-5/+8
| | | | | Change-Id: I67e85dea765bb48d7f8ba8e75b5e01814d312ef5 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Use the version string from .qmake.conf for installersFrederik Gladhorn2013-08-211-3/+11
| | | | | Change-Id: I85fde0e8e36ec892a53ad45f78e60ddded688b32 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Make it possible to build installer on linuxFrederik Gladhorn2013-07-053-15/+50
|
* Installer fixesFrederik Gladhorn2013-07-053-1/+33
| | | | | | | Get mkspecs right (not everyone has the same user name as me). Get headers right (before it only installed the forwarding headers). Show windows style paths in installer (c:\... instead of c:/...). Allow spaces in target dir.
* Add installer script and data.Frederik Gladhorn2013-07-0412-0/+1939
To create installers the Qt installer-framework is needed. Currently building installers is only tested on windows.