qt fails to build ifndef ipc ifndef meegotouch

RESOLVED FIXED

Status

defect
RESOLVED FIXED
9 years ago
3 years ago

People

(Reporter: timeless, Assigned: timeless)

Tracking

Trunk
x86
Linux
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(1 attachment, 5 obsolete attachments)

Assignee

Description

9 years ago
I tried to build cairo-qt !libxul !ipc and my build failed (a couple of times)

this is roughly the patch i used. note that there's one hunk which is strange, I don't know what the author was thinking:

-#ifndef MOZ_ENABLE_MEEGOTOUCH
+#ifdef MOZ_IPC
Assignee

Comment 1

9 years ago
Posted patch proposal (obsolete) — Splinter Review
Assignee: nobody → timeless
Status: NEW → ASSIGNED
Attachment #497129 - Flags: review?(romaxa)
Comment on attachment 497129 [details] [diff] [review]
proposal


>@@ -72,7 +72,7 @@ nsScreenQt::GetRect(PRInt32 *outLeft,PRI
>                     PRInt32 *outWidth,PRInt32 *outHeight)
> {
>     QRect r;
>-#ifdef MOZ_ENABLE_MEEGOTOUCH
>+#ifdef MOZ_IPC
>     if (XRE_GetProcessType() == GeckoProcessType_Default) {
>         MWindow *window = MApplication::activeWindow();
>         if (window) {
MWindow only available with meegotouch define.

This gonna fail on desktop and maemo5
Attachment #497129 - Flags: review?(romaxa) → review-
Assignee

Comment 3

9 years ago
Attachment #497129 - Attachment is obsolete: true
Attachment #497137 - Flags: review?(romaxa)
Attachment #497137 - Flags: approval2.0?
Comment on attachment 497137 [details] [diff] [review]
grr, i had fixed that. qrefresh doesn't like me.

the same problem... I guess you have problem with file-picker or something...

try type pach name instead of selecting it in filepicker
Attachment #497137 - Flags: review?(romaxa) → review-
Assignee

Comment 5

9 years ago
Posted patch oh one more (obsolete) — Splinter Review
Attachment #497137 - Attachment is obsolete: true
Attachment #497185 - Flags: review?(romaxa)
Attachment #497185 - Flags: approval2.0?
Attachment #497137 - Flags: approval2.0?
Comment on attachment 497185 [details] [diff] [review]
oh one more

Could you send it on try?
And it is again the same patch

-#ifdef MOZ_ENABLE_MEEGOTOUCH
+#ifdef MOZ_IPC
     if (XRE_GetProcessType() == GeckoProcessType_Default) {
         MWindow *window = MApplication::activeWindow();
Attachment #497185 - Flags: review?(romaxa) → review-
Assignee

Comment 7

9 years ago
Posted patch qrefreshed (obsolete) — Splinter Review
... not my weekend
Attachment #497185 - Attachment is obsolete: true
Attachment #497187 - Flags: review?(romaxa)
Attachment #497187 - Flags: approval2.0?
Attachment #497185 - Flags: approval2.0?
Comment on attachment 497187 [details] [diff] [review]
qrefreshed

># HG changeset patch
># Parent f140e9739f0a117bf8545fa4dd7aab945bce992c
># User timeless@mozdev.org
>Bug 618663 qt fails to build ifndef ipc ifndef meegotouch
>r=romaxa
>
>diff --git a/widget/src/qt/nsScreenQt.cpp b/widget/src/qt/nsScreenQt.cpp
>--- a/widget/src/qt/nsScreenQt.cpp
>+++ b/widget/src/qt/nsScreenQt.cpp
>@@ -72,7 +72,7 @@ nsScreenQt::GetRect(PRInt32 *outLeft,PRI
>                     PRInt32 *outWidth,PRInt32 *outHeight)
> {
>     QRect r;
>-#ifdef MOZ_ENABLE_MEEGOTOUCH
>+#if defined MOZ_IPC && defined MOZ_ENABLE_MEEGOTOUCH
>     if (XRE_GetProcessType() == GeckoProcessType_Default) {
>         MWindow *window = MApplication::activeWindow();
>         if (window) {
>diff --git a/widget/src/qt/nsWindow.cpp b/widget/src/qt/nsWindow.cpp
>--- a/widget/src/qt/nsWindow.cpp
>+++ b/widget/src/qt/nsWindow.cpp
>@@ -2262,7 +2262,7 @@ nsWindow::NativeResize(PRInt32 aWidth, P
> 
>     mNeedsResize = PR_FALSE;
> 
>-#ifndef MOZ_ENABLE_MEEGOTOUCH
>+#ifdef MOZ_IPC

Don't remove existing MOZ_ENABLE_MEEGOTOUCH... this is special hacks for broken meegotouch Widget/Window framework...
Just add MOZ_IPC as additional ifdef, and nothing more...



Problem with meegotouch hacks we will recheck and fix also later.
Attachment #497187 - Flags: review?(romaxa)
Attachment #497187 - Flags: review-
Attachment #497187 - Flags: approval2.0?
Assignee

Comment 9

9 years ago
Attachment #497187 - Attachment is obsolete: true
Attachment #499193 - Flags: review?(romaxa)
Attachment #499193 - Flags: approval2.0?
Comment on attachment 499193 [details] [diff] [review]
keeping hacky meegotouch ifdef


>@@ -2287,7 +2289,7 @@ nsWindow::NativeResize(PRInt32 aX, PRInt
>     mNeedsResize = PR_FALSE;
>     mNeedsMove = PR_FALSE;
> 
>-#ifndef MOZ_ENABLE_MEEGOTOUCH
>+#ifdef MOZ_IPC
>     if (mIsTopLevel) {
>         if (XRE_GetProcessType() == GeckoProcessType_Default) {
>             QWidget *widget = GetViewWidget();

Here you are removing ifndef meegotouch... and originally this code should not work for broken meegotouch.
Attachment #499193 - Flags: review?(romaxa) → review-
Attachment #499193 - Flags: approval2.0?
Assignee

Comment 11

9 years ago
Attachment #499193 - Attachment is obsolete: true
Attachment #502441 - Flags: review?(romaxa)
Comment on attachment 502441 [details] [diff] [review]
keeping hacky meegotouch ifdefs

Looks good now.
Attachment #502441 - Flags: review?(romaxa) → review+
Assignee

Updated

9 years ago
Keywords: checkin-needed
http://hg.mozilla.org/mozilla-central/rev/bce092d01eb0
Status: ASSIGNED → RESOLVED
Closed: 9 years ago
Resolution: --- → FIXED
Comment on attachment 502441 [details] [diff] [review]
keeping hacky meegotouch ifdefs

>+#ifdef MOZ_IPC
> #ifndef MOZ_ENABLE_MEEGOTOUCH
>     if (mIsTopLevel && XRE_GetProcessType() == GeckoProcessType_Default) {
>         QWidget *widget = GetViewWidget();
>@@ -2272,6 +2273,7 @@ nsWindow::NativeResize(PRInt32 aWidth, P
>         widget->resize(aWidth, aHeight);
>     }
> #endif
>+#endif
> 


>+#ifdef MOZ_IPC
> #ifndef MOZ_ENABLE_MEEGOTOUCH
>     if (mIsTopLevel) {
>         if (XRE_GetProcessType() == GeckoProcessType_Default) {
>@@ -2299,6 +2302,7 @@ nsWindow::NativeResize(PRInt32 aX, PRInt
>         }
>     }
> #endif
>+#endif
> 

this is still wrong. you guys ignoring top-level resizes if !ipc
only (XRE_GetProcessType() == GeckoProcessType_Default) should be ifdefed
Product: Core → Core Graveyard
You need to log in before you can comment on or make changes to this bug.