Last Comment Bug 779726 - Move QGL includes into isolated wrapper class, and fix qgl.h and GLDefs.h conflicts
: Move QGL includes into isolated wrapper class, and fix qgl.h and GLDefs.h con...
Status: RESOLVED FIXED
:
Product: Core Graveyard
Classification: Graveyard
Component: Widget: Qt (show other bugs)
: unspecified
: x86 Linux
: -- normal (vote)
: mozilla17
Assigned To: Oleg Romashin (:romaxa)
:
Mentors:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2012-08-01 22:45 PDT by Oleg Romashin (:romaxa)
Modified: 2016-07-11 21:54 PDT (History)
1 user (show)
See Also:
QA Whiteboard:
Iteration: ---
Points: ---


Attachments
WIP, need to test on different build env (7.57 KB, patch)
2012-08-01 22:47 PDT, Oleg Romashin (:romaxa)
no flags Details | Diff | Splinter Review
Fix QGL GLDefs includes conflict by moving them into isolated class (6.82 KB, patch)
2012-08-01 23:10 PDT, Oleg Romashin (:romaxa)
no flags Details | Diff | Splinter Review
Fix QGL GLDefs includes conflict by moving them into isolated class (8.54 KB, patch)
2012-08-02 11:10 PDT, Oleg Romashin (:romaxa)
dougt: review+
Details | Diff | Splinter Review

Description Oleg Romashin (:romaxa) 2012-08-01 22:45:48 PDT
Hacks with gl defines and includes order does not work very well everywhere.
in order to avoid include problems, I think it is better just move all QGL includes out of mozilla includes scope.
Comment 1 Oleg Romashin (:romaxa) 2012-08-01 22:47:35 PDT
Created attachment 648227 [details] [diff] [review]
WIP, need to test on different build env
Comment 2 Oleg Romashin (:romaxa) 2012-08-01 23:10:25 PDT
Created attachment 648233 [details] [diff] [review]
Fix QGL GLDefs includes conflict by moving them into isolated class

Harmattan,Ubuntu-arm works fine
Comment 3 Oleg Romashin (:romaxa) 2012-08-02 11:10:13 PDT
Created attachment 648395 [details] [diff] [review]
Fix QGL GLDefs includes conflict by moving them into isolated class

NPODB, but not one liner,  I guess it make sense to double check it...
Tested on desktop, maemo, ubuntu-arm linux
Comment 4 Doug Turner (:dougt) 2012-08-16 09:51:41 PDT
Comment on attachment 648395 [details] [diff] [review]
Fix QGL GLDefs includes conflict by moving them into isolated class

Review of attachment 648395 [details] [diff] [review]:
-----------------------------------------------------------------

::: widget/qt/faststartupqt/Makefile.in
@@ +22,5 @@
>  	$(NULL)
>  
> +LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build \
> +	-I$(topsrcdir)/widget/qt \
> +	$(NULL)

Can you align all of these?

LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build \
                  -I$(topsrcdir)/widget/qt \
                  $(NULL)

@@ +27,3 @@
>  
> +GARBAGE += moziqwidget.h nsQAppInstance.h nsQAppInstance.cpp mozqglwidgetwrapper.h mozqglwidgetwrapper.cpp
> +export:: $(topsrcdir)/widget/qt/moziqwidget.h $(topsrcdir)/toolkit/xre/nsQAppInstance.h $(topsrcdir)/toolkit/xre/nsQAppInstance.cpp $(topsrcdir)/widget/qt/mozqglwidgetwrapper.h $(topsrcdir)/widget/qt/mozqglwidgetwrapper.cpp

This line is getting pretty long, can you create multiple lines?

::: widget/qt/mozqglwidgetwrapper.h
@@ +1,2 @@
> +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
> +/* vim: set ts=4 et sw=4 tw=80: */

Vi line?  you don't use vim.  remove this.
Comment 6 Oleg Romashin (:romaxa) 2012-08-16 11:43:22 PDT
ups, not yet
Comment 7 Ryan VanderMeulen [:RyanVM] 2012-08-16 17:57:03 PDT
https://hg.mozilla.org/mozilla-central/rev/da1a2c7ecb4d
Comment 8 Ed Morley [:emorley] 2012-08-30 03:50:44 PDT
https://hg.mozilla.org/mozilla-central/rev/84c6d08bef5b

Note You need to log in before you can comment on or make changes to this bug.