diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-03-14 09:30:12 +0100 |
commit | 11484c7f64b5942994a1d1a07f4e7f4d86e94e83 (patch) | |
tree | f0c901d1d15d0bcb8ce572a04b094e510cd86ddd /src/quick/scenegraph/coreapi/qsgmaterial.h | |
parent | a1a7679028eda395d74cd1247a8c3ed46ac3bef1 (diff) | |
parent | b58953fae3dc80c52e846d2d87856dd20b8986ab (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro
Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgmaterial.h')
-rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 238bf83111..38862e694d 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -43,7 +43,7 @@ #define QSGMATERIAL_H #include <QtQuick/qtquickglobal.h> -#include <qopenglshaderprogram.h> +#include <QtGui/qopenglshaderprogram.h> QT_BEGIN_NAMESPACE |