Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix the name pyside2uic | Christian Tismer | 2016-04-19 | 4 | -25/+28 |
| | | | | This was modified, but not corrected in setup.py | ||||
* | Merge pull request #37 from f3nix/simple-fixes-1 | Thomas Karl Pietrowski | 2016-04-03 | 1 | -19/+12 |
|\ | | | | | Fix AppVeyor build. Simple version. | ||||
| * | Fix AppVeyor build. Simple version. | Mateusz Skowroński | 2016-04-03 | 1 | -19/+12 |
|/ | | | | Fixes #36. | ||||
* | Merge pull request #32 from techtonik/windoze | Thomas Karl Pietrowski | 2016-04-02 | 1 | -4/+4 |
|\ | | | | | Show diagnostic info | ||||
| * | appveyor.yml: Properly show diagnostic information | anatoly techtonik | 2016-02-09 | 1 | -5/+4 |
| | | |||||
| * | Add platform.machine() output (curious about Windows strings) | anatoly techtonik | 2016-02-09 | 1 | -0/+1 |
| | | |||||
* | | Update | Thomas-Karl Pietrowski | 2016-04-02 | 1 | -5/+5 |
| | | |||||
* | | update | Christian Tismer | 2016-03-01 | 1 | -7/+7 |
| | | |||||
* | | some cleanup of travis. | Christian Tismer | 2016-02-24 | 1 | -3/+3 |
| | | | | | | | | how do we separate the build step and the tests, to see both as a result? | ||||
* | | shiboken should build with tests. | Christian Tismer | 2016-02-23 | 1 | -8/+5 |
| | | | | | | | | We will see how travis works now. | ||||
* | | Revert "try to fix the build with a proper cmake" | Christian Tismer | 2016-02-23 | 1 | -2/+1 |
| | | | | | | | | This reverts commit d4c17c826af69547e57882d03d0facd265834fc8. | ||||
* | | try to fix the build with a proper cmake | Christian Tismer | 2016-02-23 | 1 | -1/+2 |
| | | |||||
* | | Update .travis.yml | Thomas Karl Pietrowski | 2016-02-23 | 1 | -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 it | Christian Tismer | 2016-02-22 | 1 | -2/+1 |
| | | |||||
* | | try to fix the travis build. | Christian Tismer | 2016-02-22 | 1 | -0/+2 |
|/ | | | | These additions are from Debian stretch | ||||
* | Removing the old label | Thomas Karl Pietrowski | 2016-02-08 | 1 | -2/+0 |
| | |||||
* | Merge pull request #25 from techtonik/patch-1 | Thomas Karl Pietrowski | 2016-02-08 | 1 | -0/+4 |
|\ | | | | | README.md Add build status for Linux AND Windows | ||||
| * | Update README.md | anatoly techtonik | 2016-02-08 | 1 | -1/+1 |
| | | | | | | Fix Travis link | ||||
| * | Update README.md | anatoly techtonik | 2016-02-08 | 1 | -1/+1 |
| | | | | | | Add link to Travis | ||||
| * | README.md Add build status | anatoly techtonik | 2016-02-02 | 1 | -0/+4 |
| | | |||||
* | | Adding label of build status on Travis | Thomas Karl Pietrowski | 2016-02-08 | 1 | -0/+2 |
| | | |||||
* | | Merge pull request #31 from techtonik/travis2 | Thomas Karl Pietrowski | 2016-02-08 | 1 | -0/+13 |
|\ \ | | | | | | | Adding Travis for tests | ||||
| * | | .travis.yml: Cleanup and --build-tests | anatoly techtonik | 2016-02-06 | 1 | -2/+1 |
| | | | |||||
| * | | .travis.yml: Let's try two jobs | anatoly techtonik | 2016-02-06 | 1 | -1/+1 |
| | | | |||||
| * | | .travis.yml: Try it the other way | anatoly techtonik | 2016-02-06 | 1 | -1/+3 |
| | | | |||||
| * | | .travis.yml: CMake needs to be told about Qt 5.5 libs | anatoly techtonik | 2016-02-06 | 1 | -1/+1 |
| | | | |||||
| * | | .travis.yml: Getting Qt 5.5 for Trusty | anatoly techtonik | 2016-02-06 | 1 | -2/+5 |
| | | | |||||
| * | | .travis.yml: libqt5xmlpatterns5-dev is needed | anatoly techtonik | 2016-02-06 | 1 | -1/+1 |
| | | | | | | | | | See https://ravirnjn.wordpress.com/2015/03/03/installing-buildmlearn-toolkit-on-ubuntu-14-04/ | ||||
| * | | .travis.yml: Switch to Trusty virtual machines | anatoly techtonik | 2016-02-06 | 1 | -8/+3 |
| | | | | | | | | | | | | | | | CMake is already installed there. VMs are chosen instead of containers when sudo is present. | ||||
| * | | .travis.yml: Attempt to install Qt5 | anatoly techtonik | 2016-02-06 | 1 | -0/+1 |
| | | | | | | | | | As described here - https://github.com/PySide/pyside2/wiki/Dependencies#ubuntu | ||||
| * | | .travis.yml: Attempt to install newer CMake | anatoly techtonik | 2016-02-06 | 1 | -0/+7 |
| | | | | | | | | | | | | This uses version from Nathan Osman backports | ||||
| * | | Create .travis.yml for Python project | anatoly techtonik | 2016-02-06 | 1 | -0/+6 |
|/ / | |||||
* | | Cleanup around qtinfo.py | Thomas-Karl Pietrowski | 2016-02-03 | 2 | -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 qtchooser | Thomas-Karl Pietrowski | 2016-02-03 | 1 | -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 Pietrowski | 2016-02-03 | 1 | -2/+2 |
| | | | | | | | | | | | | with _qmake_command Well, not more left to say. | ||||
* | | Hotfix: correcting variable name | Thomas-Karl Pietrowski | 2016-02-03 | 1 | -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 Pietrowski | 2016-02-02 | 1 | -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 list | Thomas-Karl Pietrowski | 2016-02-02 | 2 | -7/+7 |
|/ | |||||
* | update subrepos | Christian Tismer | 2016-02-02 | 1 | -0/+0 |
| | |||||
* | Merge pull request #22 from techtonik/master | Christian Tismer | 2016-02-02 | 1 | -0/+25 |
|\ | | | | | Appveyor automatic Windows builds (fixes #17) | ||||
| * | appveyor.yml Correct mingw492_32 for Qt 5.5 | anatoly techtonik | 2016-02-02 | 1 | -3/+3 |
| | | |||||
| * | appveyor.yml Switch to MinGW | anatoly techtonik | 2016-02-02 | 1 | -2/+3 |
| | | |||||
| * | appveyor.yml Try to reuse already installed Qt 5.5 | anatoly techtonik | 2016-02-02 | 1 | -4/+5 |
| | | | | | | See http://www.appveyor.com/docs/installed-software#qt | ||||
| * | appveyor.yml Save the progress | anatoly techtonik | 2016-02-02 | 1 | -0/+17 |
| | | | | | | See builds here https://ci.appveyor.com/project/techtonik/pyside2-setup | ||||
| * | Update appveyor.yml | anatoly techtonik | 2016-01-25 | 1 | -2/+3 |
| | | | | | | Trying cmd: prefix | ||||
| * | Create appveyor.yml | anatoly techtonik | 2016-01-25 | 1 | -0/+5 |
| | | |||||
* | | Merge pull request #23 from PySide/setup.py-qmake-scan | Christian Tismer | 2016-02-02 | 1 | -2/+2 |
|\ \ | |/ |/| | Prefer qmake-qt5 over qmake | ||||
| * | Prefer qmake-qt5 over qmake | Thomas-Karl Pietrowski | 2016-02-02 | 1 | -2/+2 |
|/ | | | | | | I tried to build pyside using setup.py here on Ubuntu and I get the same problem like mentioned in #21. The solution is to perfer qmake-qt5 over qmake. This shouldn't make any difference on OSX and Windows. Fixes #21 | ||||
* | Merge pull request #19 from PySide/shiboken2-cmake-testing-patch | Christian Tismer | 2016-01-21 | 1 | -14/+6 |
|\ | | | | | Updating setup.py for fixes and additions in shiboken2 | ||||
| * | Updating setup.py for fixes and additions in shiboken2 | Thomas-Karl Pietrowski | 2016-01-16 | 1 | -14/+6 |
|/ | | | This is for testing an commit for shiboken2. The changes here might be incomplete. |