| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
This enables qdoc to include the content from the QtQml
module page.
Change-Id: I889e7918ae33cdc7d11f08a7e68a97c123fa05cc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
| |
Change-Id: I9ea0bed7709265c89e1bf38624024e61ee07adc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
They share the qdoc.conf file with QtMultimedia, which
needs to be special-cased, similar to QQuickWidgets.
Task-number: PYSIDE-363
Change-Id: I5abade0a715ff3245be2322eae42e7c93f643fc9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
| |
Complements 9d10897929350417f4c7b2dcf06966ff7c67c5a6.
Task-number: PYSIDE-487
Change-Id: I4a01c986535c0d7ba8362760c1b8e89a2f8e9936
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Task-number: PYSIDE-363
Change-Id: Idc4418b6313c2f6b7946fcfb80abc772caec361b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some of the Qt documentation modules use custom module headers
that pull in additional content into the build. On a normal
Qt documentation build, these are implemented as relative paths
- these are incorrect when the doc build is invoked externally
in PySide.
To fix this, add absolute qdocconf include path entries for each
module that needs them. This cuts down the number of QDoc warnings
significantly.
Change-Id: I22756cc3170e7e2ff678986a46e117faf43a735d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
| |
Introduce an inner loop to doc/CMakeLists.txt allowing for
handling qdocconf files that contain several modules.
Task-number: PYSIDE-363
Change-Id: I71839999fe616b56fb3f2bab03bb21f49d0d1dac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
| |
Task-number: PYSIDE-363
Change-Id: If7b3e7157fccb0494860664505df96c946e1c402
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Rename qdoc3 to qdoc.
- Run qdoc in single-exec mode.
- Qt 5 documentation modules are added to the build from
/qtmodules (see existing examples in that folder).
- Fix modules.rst
Done-with: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Done-with: Topi Reiniö <topi.reinio@qt.io>
Task-number: PYSIDE-363
Change-Id: I47c3ec60c3132517424aef6c066a51c955e5bf2d
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
|
|
|
|
| |
to be replaced by a subtree merge.
|
|
|
|
|
|
|
| |
From time to time, it is good to update the master project.
Change-Id: I50c45caf7c37ebb4ea865b4e4f5896e5cd8915fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
From time to time, submodules need to be updated.
Actually, I would even like to update the master module after every submodule
checkin, but this seems to be not easy to do all the time.
Change-Id: I52f266c58086186df05ddcc85085f35e2e28ead7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
| |
Testrunner has even more variable texts to recognize.
We change the regex slightly so that it always succeeds.
Change-Id: Iac156592aac48afb5aea522540ae63c92ca2572a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The recent change that made use of framework headers on OS/X did
not work with homebrew Qt, and it didn't work with official builds
either, because neither of the chosen include folders contained
all the necessary headers to lead to a successful build.
Fortunately shiboken actually supports being passed multiple include
locations, separated by a colon on OS/X, and a semicolon on Windows.
This patch makes sure to always pass the Qt include folder, and in
case if the Qt build is a framework build, also passes the root
frameworks location, with headers found by shiboken under
frameworkName.framewework/Headers.
This works for homebrew builds, official builds and custom
non-installed prefix / in-source builds of Qt.
Change-Id: I47b24e197839883de2ab873461efc1f4d4d33743
Reviewed-by: Christian Tismer <tismer@stackless.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
| |
This was modified, but not corrected in setup.py
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
| |
Add forgotten files to WebSockets module
|
|
|
|
| |
Fix up the QtWebSockets module
|
| |
|
|
|
|
| |
Add Qt5 QML modules
|
| |
|
|
|
|
|
|
|
| |
As Romain correctly told me, QtCore is needed to be included.
The other small bug with huge effects was a forgotten rename of pyside2_global.h.
The tests now run without segfaults!
|
|
|
|
| |
show windows!
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
CMAKE is a nightmare. And if you don't read the meaning of every variable (like UNIX or CMAKE_HOST_UNIX,
which _includes_ APPLE), then the empire strikes back. :-)
|
| |
|
| |
|
| |
|
|
|
|
|
|
| |
This always refused to link on OS X.
To circumvent this, I have split the QSysInfo entry in Mac and Win version files.
The "other" file is always giving a warning, that I suppressed.
|
|
|
|
|
| |
The XML names like "PySide.QtCore" go into the binaries for import, so it is necessary
to change them all. There are also hundreds of Python files which must bechanged, as well.
|
|
|
|
| |
still, there seem to be errors....
|
|
|
|
|
|
| |
I just understood what is needed to define a package:
The files PySide2Config(...).cmake are crucial, the project names
have little to do with that.
|
|
|
|
|
|
|
|
|
|
|
| |
The intention is to have PySide2 and Shiboken2 as project names, to
allow for co-existence of PySide and PySide2.
This is the first version that builds with these settings on OS X:
$ python3 setup.py build --debug --no-examples --ignore-git --qmake=/usr/local/Cellar/qt5/5.5.0/bin/qmake --jobs=9
This is not yet tested.
|
| |
|
| |
|
| |
|
| |
|
|\
| |
| |
| | |
For the old qt4 version, the old repository should be used.
|
| | |
|
| | |
|