aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add option to link with libc++ on older OSX versions.Alexandru Croitor2016-05-114-10/+26
| | | | | | | | | | | | | | Versions of OSX lower than 10.9 link libstdc++ by default. Also libstdc++ is linked when the osx minimum deployment target is lower than 10.9. The new option allows explicitly linking libc++ in the cases mentioned above. It is not enabled by default, because most libraries and executables on versions lower than 10.9 are compiled with libstdc++, and mixing standard library versions can lead to crashes. Change-Id: I7397d2bbce2cfceaeb848f25e0bbf1a24ac9bde8 Reviewed-by: Christian Tismer <tismer@stackless.com>
* pyside-setup: Print directory in run_process().Friedemann Kleint2016-05-111-2/+1
| | | | | | | Change-Id: Iaa22b81c4e18e2490cedc547443a58680cd7764b Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix git submodules formatting.Alexandru Croitor2016-05-061-4/+4
| | | | | | | The spaces instead of tabs, broke the Coin CI parsing of the urls. Change-Id: I65c1336cb1bd291f2a5b629bb8e431b65491b7d3 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix submodule urlsSimon Hausmann2016-05-041-3/+3
| | | | | | | | Those should be coded relative so that when for example cloning pyside-setup from Gerrit, the submodules should also come from Gerrit. Change-Id: I579711eed64f0356bd5282617cfccb29937b0425 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Switch submodule repositories.Friedemann Kleint2016-05-022-10/+7
| | | | | | | | | | Clone submodules from code.qt.io and adapt branches. Change-Id: Iecf128ca00c4eb25e5450db8630e42e9307bd7cc Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* a quick shiboken fix that should work, but will become obsolete with Qt 5.6.1Christian Tismer2016-04-191-11/+5
|
* fix the name pyside2uicChristian Tismer2016-04-194-25/+28
| | | | This was modified, but not corrected in setup.py
* Merge pull request #37 from f3nix/simple-fixes-1Thomas Karl Pietrowski2016-04-031-19/+12
|\ | | | | Fix AppVeyor build. Simple version.
| * Fix AppVeyor build. Simple version.Mateusz Skowroński2016-04-031-19/+12
|/ | | | Fixes #36.
* Merge pull request #32 from techtonik/windozeThomas Karl Pietrowski2016-04-021-4/+4
|\ | | | | Show diagnostic info
| * appveyor.yml: Properly show diagnostic informationanatoly techtonik2016-02-091-5/+4
| |
| * Add platform.machine() output (curious about Windows strings)anatoly techtonik2016-02-091-0/+1
| |
* | UpdateThomas-Karl Pietrowski2016-04-021-5/+5
| |
* | updateChristian Tismer2016-03-011-7/+7
| |
* | some cleanup of travis.Christian Tismer2016-02-241-3/+3
| | | | | | | | how do we separate the build step and the tests, to see both as a result?
* | shiboken should build with tests.Christian Tismer2016-02-231-8/+5
| | | | | | | | We will see how travis works now.
* | Revert "try to fix the build with a proper cmake"Christian Tismer2016-02-231-2/+1
| | | | | | | | This reverts commit d4c17c826af69547e57882d03d0facd265834fc8.
* | try to fix the build with a proper cmakeChristian Tismer2016-02-231-1/+2
| |
* | Update .travis.ymlThomas Karl Pietrowski2016-02-231-1/+1
| | | | | | The 3rd party PPA uses his own naming for its qt5.5 content. XML should be in Qt5Base, etc.
* | still trying to fix itChristian Tismer2016-02-221-2/+1
| |
* | try to fix the travis build.Christian Tismer2016-02-221-0/+2
|/ | | | These additions are from Debian stretch
* Removing the old labelThomas Karl Pietrowski2016-02-081-2/+0
|
* Merge pull request #25 from techtonik/patch-1Thomas Karl Pietrowski2016-02-081-0/+4
|\ | | | | README.md Add build status for Linux AND Windows
| * Update README.mdanatoly techtonik2016-02-081-1/+1
| | | | | | Fix Travis link
| * Update README.mdanatoly techtonik2016-02-081-1/+1
| | | | | | Add link to Travis
| * README.md Add build statusanatoly techtonik2016-02-021-0/+4
| |
* | Adding label of build status on TravisThomas Karl Pietrowski2016-02-081-0/+2
| |
* | Merge pull request #31 from techtonik/travis2Thomas Karl Pietrowski2016-02-081-0/+13
|\ \ | | | | | | Adding Travis for tests
| * | .travis.yml: Cleanup and --build-testsanatoly techtonik2016-02-061-2/+1
| | |
| * | .travis.yml: Let's try two jobsanatoly techtonik2016-02-061-1/+1
| | |
| * | .travis.yml: Try it the other wayanatoly techtonik2016-02-061-1/+3
| | |
| * | .travis.yml: CMake needs to be told about Qt 5.5 libsanatoly techtonik2016-02-061-1/+1
| | |
| * | .travis.yml: Getting Qt 5.5 for Trustyanatoly techtonik2016-02-061-2/+5
| | |
| * | .travis.yml: libqt5xmlpatterns5-dev is neededanatoly techtonik2016-02-061-1/+1
| | | | | | | | | See https://ravirnjn.wordpress.com/2015/03/03/installing-buildmlearn-toolkit-on-ubuntu-14-04/
| * | .travis.yml: Switch to Trusty virtual machinesanatoly techtonik2016-02-061-8/+3
| | | | | | | | | | | | | | | CMake is already installed there. VMs are chosen instead of containers when sudo is present.
| * | .travis.yml: Attempt to install Qt5anatoly techtonik2016-02-061-0/+1
| | | | | | | | | As described here - https://github.com/PySide/pyside2/wiki/Dependencies#ubuntu
| * | .travis.yml: Attempt to install newer CMakeanatoly techtonik2016-02-061-0/+7
| | | | | | | | | | | | This uses version from Nathan Osman backports
| * | Create .travis.yml for Python projectanatoly techtonik2016-02-061-0/+6
|/ /
* | Cleanup around qtinfo.pyThomas-Karl Pietrowski2016-02-032-20/+15
| | | | | | | | | | | | * cleaning up unneeded redeclarations in setup.py * making sure our "-qt=X" get passed to cmake (doesn't make any difference so far, but makes sense) * rename getQMakePath to getQMakeCommand and make it return the complete command
* | Adding -qt=X option only if qmake is a link to qtchooserThomas-Karl Pietrowski2016-02-031-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | On Linux (at least on Ubuntu and Debian) qtchooser is used to switch between different installations of Qt. A user reported that on Windows this method does not (seem) exist. Don't know whether his/her Qt5 setup was correct or not, but this commit adds a check, which * Looks whether qmake exists at all * Checks whether it is a symlink * Checks whether the symlink is pointing at a existing file * And check whether this file is qtchooser. It doesn't matter if the link is called "/usr/bin/qtchooser" or "qtchooser" and we only add "-qt=X" in these cases.
* | Fixing the hotfix: Importing needed "os" and at least replacing _qmake_path ↵Thomas-Karl Pietrowski2016-02-031-2/+2
| | | | | | | | | | | | with _qmake_command Well, not more left to say.
* | Hotfix: correcting variable nameThomas-Karl Pietrowski2016-02-031-1/+6
| | | | | | | | | | | | Like an user noticed (thanks for that), I just missed to rename a variable. So I just fixed it and added made the code at this place a little bit more failsave. https://github.com/PySide/pyside2-setup/commit/ca90a050c12f52bf5f4fb55f721ee5811f583afe#commitcomment-15862337
* | Intoducing new option "qt"Thomas-Karl Pietrowski2016-02-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I would even call it qt_version, but qtchooser, which switches between different versions of Qt, is also using this option. So I hope this would be less confusing for other people. So in case you have different Qt5 installations you can choose now one of them by using --qt=5.4 for example. ``` $ qtchooser -l 4 5 default qt4-i386-linux-gnu qt4-x86_64-linux-gnu qt4 qt5-x86_64-linux-gnu qt5 ``` The main reason for this commit is that qtchooser chooses qt4 as default here on Ubuntu/Linux (as we can also see in the travis builds). This commit will add the option plus add the default to qt5.
* | Passing command(s) to qtinfo as listThomas-Karl Pietrowski2016-02-022-7/+7
|/
* update subreposChristian Tismer2016-02-021-0/+0
|
* Merge pull request #22 from techtonik/masterChristian Tismer2016-02-021-0/+25
|\ | | | | Appveyor automatic Windows builds (fixes #17)
| * appveyor.yml Correct mingw492_32 for Qt 5.5anatoly techtonik2016-02-021-3/+3
| |
| * appveyor.yml Switch to MinGWanatoly techtonik2016-02-021-2/+3
| |
| * appveyor.yml Try to reuse already installed Qt 5.5anatoly techtonik2016-02-021-4/+5
| | | | | | See http://www.appveyor.com/docs/installed-software#qt
| * appveyor.yml Save the progressanatoly techtonik2016-02-021-0/+17
| | | | | | See builds here https://ci.appveyor.com/project/techtonik/pyside2-setup
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 05:49:33 +0000