Merge lp:~zsombi/unity8/u8GestureImports into lp:unity8
| Status: | Superseded |
|---|---|
| Proposed branch: | lp:~zsombi/unity8/u8GestureImports |
| Merge into: | lp:unity8 |
| Diff against target: |
486 lines (+76/-49) 19 files modified
debian/changelog (+6/-0) debian/control (+6/-6) plugins/Ubuntu/Gestures/AxisVelocityCalculator.cpp (+1/-1) plugins/Ubuntu/Gestures/AxisVelocityCalculator.h (+4/-4) plugins/Ubuntu/Gestures/CMakeLists.txt (+1/-0) plugins/Ubuntu/Gestures/TouchGate.cpp (+6/-4) plugins/Ubuntu/Gestures/TouchGate.h (+3/-2) plugins/Ubuntu/Gestures/TouchGestureArea.cpp (+9/-7) plugins/Ubuntu/Gestures/TouchGestureArea.h (+7/-6) tests/plugins/Ubuntu/Gestures/CMakeLists.txt (+1/-0) tests/plugins/Ubuntu/Gestures/GestureTest.cpp (+3/-3) tests/plugins/Ubuntu/Gestures/GestureTest.h (+4/-5) tests/plugins/Ubuntu/Gestures/tst_AxisVelocityCalculator.cpp (+1/-1) tests/plugins/Ubuntu/Gestures/tst_FloatingFlickable.cpp (+1/-1) tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp (+3/-1) tests/qmltests/Components/tst_DragHandle.cpp (+2/-2) tests/qmltests/Components/tst_EdgeDragEvaluator.cpp (+2/-2) tests/utils/modules/Unity/Test/CMakeLists.txt (+1/-0) tests/utils/modules/Unity/Test/testutil.cpp (+15/-4) |
| To merge this branch: | bzr merge lp:~zsombi/unity8/u8GestureImports |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Unity8 CI Bot | continuous-integration | Needs Fixing on 2016-07-15 | |
| Daniel d'Andrada (community) | code | 2016-07-06 | Approve on 2016-07-15 |
|
Review via email:
|
|||
This proposal has been superseded by a proposal from 2016-07-22.
Commit Message
Use private UbuntuGestures headers instead of fw-headers.
Description of the Change
* Are there any related MPs required for this MP to build/function as expected? Please list.
- A new UbuntuGestures library build is required. Should be landed together with a new UITK landing. Silo019 has the build artifacts.
* Did you perform an exploratory manual test run of your code change and any related functionality?
- No, as the change only makes changes to build with the UITK changes made.
* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
- NA
* If you changed the UI, has there been a design review?
- NA
- 2535. By Zsombor Egri on 2016-07-11
-
be more precise on dep versions
| Daniel d'Andrada (dandrader) wrote : | # |
"""
+UG_USE_NAMESPACE
85
86 AxisVelocityCal
87 - : AxisVelocityCal
88 + : AxisVelocityCal
""""
There's no need to prepend the namespace if there's already a "using namespace" statement at the beginning of the file.
| Daniel d'Andrada (dandrader) wrote : | # |
What's the story behind the optional namespace by the way? It's making our code look like GOBJECT code :D
| Zsombor Egri (zsombi) wrote : | # |
> """
> +UG_USE_NAMESPACE
> 85
> 86 AxisVelocityCal
> 87 - : AxisVelocityCal
> parent)
> 88 + :
> AxisVelocityCal
> UG_PREPEND_
> """"
>
> There's no need to prepend the namespace if there's already a "using
> namespace" statement at the beginning of the file.
Well, it didn't let me build... SO I had to add the NS anyway... Will try again, but that was the case :(
| Zsombor Egri (zsombi) wrote : | # |
> What's the story behind the optional namespace by the way? It's making our
> code look like GOBJECT code :D
It looks like Qt as well :) They do the same. And they do it wrong btw - when they use Quick objects in properties and signals, they'd need to prepend the NS everywhere, otherwise the signature will not be the same... They even have a tutorial/sample for that, and they're failing doing that...
- 2536. By Zsombor Egri on 2016-07-13
-
merge trunk
| Zsombor Egri (zsombi) wrote : | # |
> > """
> > +UG_USE_NAMESPACE
> > 85
> > 86 AxisVelocityCal
> > 87 - : AxisVelocityCal
> > parent)
> > 88 + :
> > AxisVelocityCal
> > UG_PREPEND_
> > """"
> >
> > There's no need to prepend the namespace if there's already a "using
> > namespace" statement at the beginning of the file.
>
> Well, it didn't let me build... SO I had to add the NS anyway... Will try
> again, but that was the case :(
Mehh... I may have messed up something because of which it wasn't building seems...
- 2537. By Zsombor Egri on 2016-07-13
-
no need to prepend namespace when using is set
- 2538. By Zsombor Egri on 2016-07-13
-
few more tests using namespace
| Albert Astals Cid (aacid) wrote : | # |
- void setTimeSource(const UbuntuGestures:
+ void setTimeSource(const UG_PREPEND_
Do you really consider this change an improvement?
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2538
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| Daniel d'Andrada (dandrader) wrote : | # |
On 13/07/2016 06:07, Albert Astals Cid wrote:
> - void setTimeSource(const UbuntuGestures:
> + void setTimeSource(const UG_PREPEND_
>
> Do you really consider this change an improvement?
From what I understood by looking at ubuntu-ui-toolkit code. It may be
that UbuntuGestures was built *without* a namespace (you can choose it
at qmake time), in which case code must not use or refer to it as it
won't exist. All those macros will check whether UbuntuGestures was
built with a namespace and if so, it will add it, otherwise it will be a
NOOP.
We (unity8) have no choice but to obey and follow their design,
otherwise our code will not compile if UbuntuGestures was built without
a namespace.
But it still puzzles me why ubuntu-ui-toolkit added this configuration
option to disable UbuntuGestures namespace in the first place.
| Daniel d'Andrada (dandrader) wrote : | # |
Didn't try to build it myself. But all changes seem pretty harmless to me (as in as long as it builds it should be fine).
| Daniel d'Andrada (dandrader) wrote : | # |
PreviewIconActi
"var label = findChildsByTyp
That also fails:
$ make xvfbtestDashContent FUNCTION=
The other failures listed in https:/
| Daniel d'Andrada (dandrader) wrote : | # |
The DashContent failure occurs in tests/qmltests/
The other failing test can be run like this:
$ make xvfbtestPreview
If you wanna see them on the screen use "make testFoo" instead of "make xvfbtestFoo"
- 2539. By Zsombor Egri on 2016-07-15
-
strip known namespaces from the class names
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2539
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
| Daniel d'Andrada (dandrader) wrote : | # |
DashContent and PreviewIconActions tests pass now.
- 2540. By Zsombor Egri on 2016-07-15
-
trunk sync
| Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2540
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/
FAILED: Continuous integration, rev:2532
https:/
Executed test runs:
FAILURE: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
SUCCESS: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
FAILURE: https:/
Click here to trigger a rebuild:
https:/