Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

program name as window title, Qt and OpenGL fixes #463

Merged
merged 10 commits into from
Jul 16, 2015
Merged

Conversation

eile
Copy link
Member

@eile eile commented Jul 6, 2015

No description provided.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/149/
Test FAILed.

@tribal-tec
Copy link
Member

Missing changelog update

@eile
Copy link
Member Author

eile commented Jul 7, 2015

@tribal-tec
Copy link
Member

After the release

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/151/
Test PASSed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/154/
Test PASSed.

@@ -58,7 +58,9 @@ common_package(Collage 1.1 REQUIRED )
common_package(OpenGL REQUIRED )
common_package(Boost 1.41.0 REQUIRED COMPONENTS program_options filesystem system thread)
common_package(Pression 1.0 REQUIRED )
common_package(X11 )
if(NOT EQ_AGL_USED)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will be overwritten by Buildyard

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know. It's a placeholder for me, will do properly once your cmake changes are in.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/155/
Test PASSed.

@@ -39,6 +39,7 @@ Equalizer provides the following major features to facilitate the development an

## git master

* Use program name as default window title
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put to new Changelog.md

@tribal-tec
Copy link
Member

rebase

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/156/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/157/
Test FAILed.

# Release 1.9 (07-07-2015) {#Release19}
## git master {#master}

* Use program name as default window title
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

link to PR

@tribal-tec
Copy link
Member

Version bump to 1.10

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/158/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/160/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/161/
Test FAILed.

@eile
Copy link
Member Author

eile commented Jul 15, 2015

retest this please.

@eile eile changed the title Use program name as default window title program name as window title, Qt and OpenGL fixes Jul 15, 2015
set(X11_FOUND)
else()
set(EQ_GLX_USED 1)
list(APPEND FIND_PACKAGES_DEFINES EQUALIZER_USE_X11)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this variable name changed

*/
virtual void configExit( );
//@}
virtual bool configInit( );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

final

* @return true if the deinitialization was successful, false otherwise.
* @version 1.0
*/
virtual void configExit( );
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dito

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/166/
Test FAILed.


void initQt( int argc LB_UNUSED, char** argv LB_UNUSED )
{
#if EQ_GLX_USED || EQ_WGL_USED || EQ_AGL_USED
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why? If not EQ_QT_USED, it has the same effect.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I only want to create an app if I'm in Qt-only (not Qt+AGL/GLX) mode.

@tribal-tec
Copy link
Member

Yes, that's a big change. Not more please :) But looks very good. I'd always wanted to work on the Qt for OSX, but I'm curious to use it too!

@eile
Copy link
Member Author

eile commented Jul 15, 2015

Not my fault with the big change. Half of it was ready last week (and waiting on the CMake stuff). Will address the rest.

@tribal-tec
Copy link
Member

Yes, your fault. The CMake stuff was planned, OSX Livre was not :p

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/167/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/169/
Test FAILed.

@eile
Copy link
Member Author

eile commented Jul 16, 2015

retest this please

@tribal-tec
Copy link
Member

+1 now. Merge when green.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/171/
Test FAILed.

@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/172/
Test FAILed.

@eile
Copy link
Member Author

eile commented Jul 16, 2015

retest this please

eile added a commit that referenced this pull request Jul 16, 2015
program name as window title, Qt and OpenGL fixes
@eile eile merged commit 7132a40 into Eyescale:master Jul 16, 2015
@bbpbuildbot
Copy link

Refer to this link for build results (access rights to CI server needed):
https://bbpcode.epfl.ch/ci//job/oss.Equalizer.github/173/
Test FAILed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants