diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-22 11:37:53 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-02-22 11:17:33 +0000 |
| commit | 80aa882f6b8344f90ec5dcf414b8fb3b375aaa77 (patch) | |
| tree | a9b34bd80a91f98b7b956f12d9a36adb19f73448 | |
| parent | 377779399c3dcb771dd0a08f896d4964f3234dab (diff) | |
Fix some include paths
Add modules since shiboken is passed only -I<Qt>/include.
Set QtOpenGL instead @QT_QTOPENGL_INCLUDE_DIR@ which does
not seem to be set anyhwhere.
Task-number: PYSIDE-323
Change-Id: I81690b42ee58fbfc325d47d813e5c587a4a07b9d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| -rw-r--r-- | PySide2/global.h.in | 2 | ||||
| -rw-r--r-- | PySide2/qpytextobject.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/PySide2/global.h.in b/PySide2/global.h.in index e58c2375..a71814fd 100644 --- a/PySide2/global.h.in +++ b/PySide2/global.h.in @@ -456,5 +456,5 @@ QT_END_NAMESPACE #ifndef QT_NO_OPENGL #include <@GL_H@> -#include <@QT_QTOPENGL_INCLUDE_DIR@/QtOpenGL> +#include <QtOpenGL/QtOpenGL> #endif // QT_NO_OPENGL diff --git a/PySide2/qpytextobject.h b/PySide2/qpytextobject.h index 2133988f..1c0383e3 100644 --- a/PySide2/qpytextobject.h +++ b/PySide2/qpytextobject.h @@ -40,8 +40,8 @@ #ifndef QPYTEXTOBJECT #define QPYTEXTOBJECT -#include <QObject> -#include <QTextObjectInterface> +#include <QtCore/QObject> +#include <QtGui/QTextObjectInterface> // Qt5: no idea why this definition is not found automatically! It should come // from <QTextObjectInterface> which resolves to qabstracttextdocumentlayout.h |