Re: [PATCH] qtbase-examples: Add exit buttons when not using wayland.

[Denys Dmytriyenko <denys@ti.com>]

I'm cnfused - why are you patching/adding png image twice?


On Thu, Mar 19, 2015 at 02:49:25PM -0400, Jacob Stiffler wrote:
> * Only the examples which are exposed in matrix are patched.
> 
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>  ...Add-exit-button-for-non-window-environmen.patch |   60 +++++++++++
>  ...es-Add-exit-button-for-non-window-environ.patch |  104 ++++++++++++++++++++
>  meta-arago-distro/recipes-qt/qt5/qtbase/quit.png   |  Bin 0 -> 645 bytes
>  .../recipes-qt/qt5/qtbase_5.4.1.bbappend           |   23 ++++-
>  4 files changed, 185 insertions(+), 2 deletions(-)
>  create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0001-calculator-Add-exit-button-for-non-window-environmen.patch
>  create mode 100644 meta-arago-distro/recipes-qt/qt5/qtbase/0002-animatedtiles-Add-exit-button-for-non-window-environ.patch
>  create mode 100755 meta-arago-distro/recipes-qt/qt5/qtbase/quit.png
> 
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0001-calculator-Add-exit-button-for-non-window-environmen.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-calculator-Add-exit-button-for-non-window-environmen.patch
> new file mode 100644
> index 0000000..e123df5
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0001-calculator-Add-exit-button-for-non-window-environmen.patch
> @@ -0,0 +1,60 @@
> +From b0cb70d35131643dce61fa5a8ce9f652dc63e963 Mon Sep 17 00:00:00 2001
> +From: Jake Stiffler <jake@mcsdk-hpc-test.(none)>
> +Date: Thu, 19 Mar 2015 15:21:08 -0400
> +Subject: [PATCH 1/2] calculator: Add exit button for non-window environment.
> +
> +Signed-off-by: Jake Stiffler <jake@mcsdk-hpc-test.(none)>
> +---
> + examples/widgets/widgets/calculator/calculator.cpp |    9 ++++++++-
> + examples/widgets/widgets/calculator/calculator.h   |    1 +
> + 2 files changed, 9 insertions(+), 1 deletion(-)
> +
> +diff --git a/examples/widgets/widgets/calculator/calculator.cpp b/examples/widgets/widgets/calculator/calculator.cpp
> +index bb3836b..afe0bba 100644
> +--- a/examples/widgets/widgets/calculator/calculator.cpp
> ++++ b/examples/widgets/widgets/calculator/calculator.cpp
> +@@ -78,6 +78,7 @@ Calculator::Calculator(QWidget *parent)
> +     Button *backspaceButton = createButton(tr("Backspace"), SLOT(backspaceClicked()));
> +     Button *clearButton = createButton(tr("Clear"), SLOT(clear()));
> +     Button *clearAllButton = createButton(tr("Clear All"), SLOT(clearAll()));
> ++    Button *quitButton = createButton(tr("Quit"), SLOT(quitClicked()));
> + 
> +     Button *clearMemoryButton = createButton(tr("MC"), SLOT(clearMemory()));
> +     Button *readMemoryButton = createButton(tr("MR"), SLOT(readMemory()));
> +@@ -100,7 +101,8 @@ Calculator::Calculator(QWidget *parent)
> + //! [5] //! [6]
> +     mainLayout->setSizeConstraint(QLayout::SetFixedSize);
> +     mainLayout->addWidget(display, 0, 0, 1, 6);
> +-    mainLayout->addWidget(backspaceButton, 1, 0, 1, 2);
> ++    mainLayout->addWidget(quitButton, 1, 0, 1, 1);
> ++    mainLayout->addWidget(backspaceButton, 1, 1, 1, 1);
> +     mainLayout->addWidget(clearButton, 1, 2, 1, 2);
> +     mainLayout->addWidget(clearAllButton, 1, 4, 1, 2);
> + 
> +@@ -297,6 +299,11 @@ void Calculator::changeSignClicked()
> + }
> + //! [24]
> + 
> ++void Calculator::quitClicked()
> ++{
> ++    qApp->quit();
> ++}
> ++
> + //! [26]
> + void Calculator::backspaceClicked()
> + {
> +diff --git a/examples/widgets/widgets/calculator/calculator.h b/examples/widgets/widgets/calculator/calculator.h
> +index 76cf048..5e5c52e 100644
> +--- a/examples/widgets/widgets/calculator/calculator.h
> ++++ b/examples/widgets/widgets/calculator/calculator.h
> +@@ -64,6 +64,7 @@ private slots:
> +     void equalClicked();
> +     void pointClicked();
> +     void changeSignClicked();
> ++    void quitClicked();
> +     void backspaceClicked();
> +     void clear();
> +     void clearAll();
> +-- 
> +1.7.9.5
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/0002-animatedtiles-Add-exit-button-for-non-window-environ.patch b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-animatedtiles-Add-exit-button-for-non-window-environ.patch
> new file mode 100644
> index 0000000..cb39450
> --- /dev/null
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase/0002-animatedtiles-Add-exit-button-for-non-window-environ.patch
> @@ -0,0 +1,104 @@
> +From e36fc9af517fe69bd4beac89fd00929fe70938b5 Mon Sep 17 00:00:00 2001
> +From: Jake Stiffler <jake@mcsdk-hpc-test.(none)>
> +Date: Thu, 19 Mar 2015 15:22:51 -0400
> +Subject: [PATCH 2/2] animatedtiles: Add exit button for non-window
> + environment.
> +
> +Signed-off-by: Jake Stiffler <jake@mcsdk-hpc-test.(none)>
> +---
> + .../animation/animatedtiles/animatedtiles.qrc      |    1 +
> + .../animation/animatedtiles/images/quit.png        |  Bin 0 -> 645 bytes
> + examples/widgets/animation/animatedtiles/main.cpp  |   13 ++++++++++++-
> + 3 files changed, 13 insertions(+), 1 deletion(-)
> + create mode 100755 examples/widgets/animation/animatedtiles/images/quit.png
> +
> +diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.qrc b/examples/widgets/animation/animatedtiles/animatedtiles.qrc
> +index c43a979..3675345 100644
> +--- a/examples/widgets/animation/animatedtiles/animatedtiles.qrc
> ++++ b/examples/widgets/animation/animatedtiles/animatedtiles.qrc
> +@@ -6,6 +6,7 @@
> +     <file>images/figure8.png</file>
> +     <file>images/kinetic.png</file>
> +     <file>images/random.png</file>
> ++    <file>images/quit.png</file>
> +     <file>images/tile.png</file>
> + </qresource>
> + </RCC>
> +diff --git a/examples/widgets/animation/animatedtiles/images/quit.png b/examples/widgets/animation/animatedtiles/images/quit.png
> +new file mode 100755
> +index 0000000000000000000000000000000000000000..b9eb270c97306679f991669992d18a5f37e4ce22
> +GIT binary patch
> +literal 645
> +zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j0wiy}j=c}0SkfJR9T^xl_H+M9WCijSl0AZa
> +z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP
> +zfk$L90|Vb-5N14{zXE6%W4EV^V@SoVx3i+xF)Q*ox4)}DU&4IYN6u`^wDaMiFVzZ<
> +zwk8zC9+OD!F$57Jk4qT6)7BlEGa;p*qbFgTzu^y`Ke6F%9X%7uHWfW_Shq`H+LYZZ
> +z9xUDJ>}8qc&k=R1*5uW?(0<3RdAd#NOC>GincTgsvz9XK5pg&YRkcRMW6R=`6DPjn
> +zW(sC_!*02IQ=|8m?YF;hHU3*Z_qN%=>iGW}t3_GvA38thWQ()tW%Z|Ai@&h_mbMGp
> +z-nP5?IM))>xgNp~_j)`sWq93YBkr~L?1J36r5o>fOCFqmDyFXSrlebR2$zZZal;-D
> +z#`Ltv`T0Q)Dl6sQO%`zqTPC@8lGDkXrZ4K)^w+lWc*W)K_m%u`CoeF_=-;|bk<7=g
> +zdSOc8v4Wo+kMIc@zHreA78H(t66yG4q5G4UzE2E8o>WGqBsiqBIH#;|OF7e7bNqE`
> +zhjdAeWOUV9S)*$+PaK{p<DbK_uaWEF%(Y8Tgeu;d_-W%09t{oK)qDv>d`D`T|4BdS
> +z`z8$yS<92+A6>FNSfU-gfN`Z-;u=wsl30>zm0Xkxq!^403{7<njCBnyLktbA49%>J
> +pjI|96tqctMnb}UEXvob^$xN%nt>ItXzA~T&22WQ%mvv4FO#o;X_JaTb
> +
> +literal 0
> +HcmV?d00001
> +
> +diff --git a/examples/widgets/animation/animatedtiles/main.cpp b/examples/widgets/animation/animatedtiles/main.cpp
> +index 09e9790..d8491d7 100644
> +--- a/examples/widgets/animation/animatedtiles/main.cpp
> ++++ b/examples/widgets/animation/animatedtiles/main.cpp
> +@@ -97,6 +97,12 @@ public:
> +         painter->drawPixmap(-_pix.width()/2, -_pix.height()/2, _pix);
> +     }
> + 
> ++public slots:
> ++    void quitClicked()
> ++    {
> ++        qApp->quit();
> ++    }
> ++
> + signals:
> +     void pressed();
> + 
> +@@ -121,6 +127,7 @@ class View : public QGraphicsView
> + public:
> +     View(QGraphicsScene *scene) : QGraphicsView(scene) { }
> + 
> ++
> + protected:
> +     void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE
> +     {
> +@@ -156,16 +163,18 @@ int main(int argc, char **argv)
> +     Button *randomButton = new Button(QPixmap(":/images/random.png"), buttonParent);
> +     Button *tiledButton = new Button(QPixmap(":/images/tile.png"), buttonParent);
> +     Button *centeredButton = new Button(QPixmap(":/images/centered.png"), buttonParent);
> ++    Button *quitButton = new Button(QPixmap(":/images/quit.png"), buttonParent);
> + 
> +     ellipseButton->setPos(-100, -100);
> +     figure8Button->setPos(100, -100);
> +     randomButton->setPos(0, 0);
> +     tiledButton->setPos(-100, 100);
> +     centeredButton->setPos(100, 100);
> ++    quitButton->setPos(100, -600);
> + 
> +     scene.addItem(buttonParent);
> +     buttonParent->setTransform(QTransform::fromScale(0.75, 0.75), true);
> +-    buttonParent->setPos(200, 200);
> ++    buttonParent->setPos(400, 200);
> +     buttonParent->setZValue(65);
> + 
> +     // States
> +@@ -239,6 +248,8 @@ int main(int argc, char **argv)
> +     trans = rootState->addTransition(centeredButton, SIGNAL(pressed()), centeredState);
> +     trans->addAnimation(group);
> + 
> ++    QObject::connect(quitButton, SIGNAL(pressed()), quitButton, SLOT(quitClicked()));
> ++
> +     QTimer timer;
> +     timer.start(125);
> +     timer.setSingleShot(true);
> +-- 
> +1.7.9.5
> +
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase/quit.png b/meta-arago-distro/recipes-qt/qt5/qtbase/quit.png
> new file mode 100755
> index 0000000000000000000000000000000000000000..b9eb270c97306679f991669992d18a5f37e4ce22
> GIT binary patch
> literal 645
> zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j0wiy}j=c}0SkfJR9T^xl_H+M9WCijSl0AZa
> z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6d9Oz#v{QXIG#NP=YDR+ueoXe|!I#{XiaP
> zfk$L90|Vb-5N14{zXE6%W4EV^V@SoVx3i+xF)Q*ox4)}DU&4IYN6u`^wDaMiFVzZ<
> zwk8zC9+OD!F$57Jk4qT6)7BlEGa;p*qbFgTzu^y`Ke6F%9X%7uHWfW_Shq`H+LYZZ
> z9xUDJ>}8qc&k=R1*5uW?(0<3RdAd#NOC>GincTgsvz9XK5pg&YRkcRMW6R=`6DPjn
> zW(sC_!*02IQ=|8m?YF;hHU3*Z_qN%=>iGW}t3_GvA38thWQ()tW%Z|Ai@&h_mbMGp
> z-nP5?IM))>xgNp~_j)`sWq93YBkr~L?1J36r5o>fOCFqmDyFXSrlebR2$zZZal;-D
> z#`Ltv`T0Q)Dl6sQO%`zqTPC@8lGDkXrZ4K)^w+lWc*W)K_m%u`CoeF_=-;|bk<7=g
> zdSOc8v4Wo+kMIc@zHreA78H(t66yG4q5G4UzE2E8o>WGqBsiqBIH#;|OF7e7bNqE`
> zhjdAeWOUV9S)*$+PaK{p<DbK_uaWEF%(Y8Tgeu;d_-W%09t{oK)qDv>d`D`T|4BdS
> z`z8$yS<92+A6>FNSfU-gfN`Z-;u=wsl30>zm0Xkxq!^403{7<njCBnyLktbA49%>J
> pjI|96tqctMnb}UEXvob^$xN%nt>ItXzA~T&22WQ%mvv4FO#o;X_JaTb
> 
> literal 0
> HcmV?d00001
> 
> diff --git a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
> index 4af0582..210d23f 100644
> --- a/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
> +++ b/meta-arago-distro/recipes-qt/qt5/qtbase_5.4.1.bbappend
> @@ -5,11 +5,30 @@ GLES_EXTRA_DEPS_omap-a15 = "libdrm wayland"
>  
>  PACKAGECONFIG[gles2] = "-opengl es2 -eglfs,,virtual/libgles2 virtual/egl ${GLES_EXTRA_DEPS}"
>  
> -PR_append = "-arago4"
> +PR_append = "-arago5"
>  
>  QT_CONFIG_FLAGS += "-qpa ${@base_contains('DISTRO_FEATURES', 'wayland', 'wayland', 'eglfs', d)}"
>  
> -SRC_URI += "file://qt_env.sh"
> +QT_EGLFS_PATCHES = "\
> +    file://0001-calculator-Add-exit-button-for-non-window-environmen.patch \
> +    file://0002-animatedtiles-Add-exit-button-for-non-window-environ.patch \
> +    file://quit.png \
> +"
> +
> +SRC_URI += "\
> +    file://qt_env.sh \
> +    ${@base_contains('DISTRO_FEATURES', 'wayland', '', "${QT_EGLFS_PATCHES}", d)}\
> +"
> +
> +python do_patch_append() {
> +    import shutil
> +
> +    work_dir = d.getVar("WORKDIR", True)
> +    s = d.getVar("S", True)
> +
> +    if not oe.utils.contains('DISTRO_FEATURES','wayland',True,False,d):
> +        shutil.copy(os.path.join(work_dir,"quit.png"),os.path.join(s,"examples/widgets/animation/animatedtiles/images/"))
> +}
>  
>  # Add custom Arago Qt 5 Environment script file
>  do_install_append () {
> -- 
> 1.7.9.5
> 
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago