[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -6,7 +6,7 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/qt5-qpa-hwcomposer-plugin.git</param>
<param name="branch">master</param>
- <param name="revision">b86a5714bd5d1d31616c7ee8851946424310a2d7</param>
+ <param name="revision">ba0a7fd3d446d4962e6750b024edb77d7c7f706f</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.9.tar.bz2/hwcomposer/hwcomposer_backend.h
^
|
@@ -67,7 +67,7 @@
// Evaluate "x", if it is NULL, exit with a fatal error
#define HWC_PLUGIN_FATAL(x) \
- qFatal("QPA-HWC: %s", x, __func__)
+ qFatal("QPA-HWC: %s in %s", x, __func__)
// Evaluate "x", if it is NULL, exit with a fatal error
#define HWC_PLUGIN_ASSERT_NOT_NULL(x) \
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.9.tar.bz2/hwcomposer/hwcomposer_backend_v11.cpp
^
|
@@ -100,9 +100,6 @@
, hwc_win(NULL)
, hwc_list(NULL)
, hwc_mList(NULL)
- , oldretire(-1)
- , oldrelease(-1)
- , oldrelease2(-1)
, num_displays(num_displays)
{
hwc_version = interpreted_version(hw_device);
@@ -178,7 +175,7 @@
layer->visibleRegionScreen.rects = &layer->displayFrame;
layer->acquireFenceFd = -1;
layer->releaseFenceFd = -1;
-#if (ANDROID_VERSION_MAJOR >= 4) && (ANDROID_VERSION_MINOR >= 3)
+#if (ANDROID_VERSION_MAJOR >= 4) && (ANDROID_VERSION_MINOR >= 3) || (ANDROID_VERSION_MAJOR >= 5)
layer->planeAlpha = 0xff;
#endif
@@ -203,7 +200,7 @@
layer->visibleRegionScreen.rects = &layer->displayFrame;
layer->acquireFenceFd = -1;
layer->releaseFenceFd = -1;
-#if (ANDROID_VERSION_MAJOR >= 4) && (ANDROID_VERSION_MINOR >= 3)
+#if (ANDROID_VERSION_MAJOR >= 4) && (ANDROID_VERSION_MINOR >= 3) || (ANDROID_VERSION_MAJOR >= 5)
layer->planeAlpha = 0xff;
#endif
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.9.tar.bz2/hwcomposer/hwcomposer_backend_v11.h
^
|
@@ -67,9 +67,6 @@
hwc_display_contents_1_t *hwc_list;
hwc_display_contents_1_t **hwc_mList;
uint32_t hwc_version;
- int oldretire;
- int oldrelease;
- int oldrelease2;
int num_displays;
};
|
[-]
[+]
|
Changed |
_service:tar_git:qt5-qpa-hwcomposer-plugin-5.1.0.9.tar.bz2/hwcomposer/main.cpp
^
|
@@ -47,11 +47,8 @@
class QEglFSIntegrationPlugin : public QPlatformIntegrationPlugin
{
Q_OBJECT
-#if QT_VERSION < QT_VERSION_CHECK(5, 2, 0)
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.1" FILE "hwcomposer.json")
-#else
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QPA.QPlatformIntegrationFactoryInterface.5.2" FILE "hwcomposer.json")
-#endif
+ Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "hwcomposer.json")
+
public:
QPlatformIntegration *create(const QString&, const QStringList&);
};
|