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

Connect to QScreen for orientation change updates #12

Merged
merged 1 commit into from Oct 10, 2013

Conversation

bzeller
Copy link

@bzeller bzeller commented Oct 1, 2013

No description provided.

@faenil
Copy link
Member

faenil commented Oct 8, 2013

can you squash the second commit?

maybe @rburchell can review this ;)

looks okay to me though

@@ -255,6 +254,17 @@ void MDeclarativeScreenPrivate::initContextSubscriber()
q, SLOT(_q_updateOrientationAngle()));
QObject::connect(&remoteTopEdgeListener, SIGNAL(nameDisappeared()),
q, SLOT(_q_updateOrientationAngle()));

#elif QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QScreen* screen = QGuiApplication::primaryScreen();
Copy link
Contributor

Choose a reason for hiding this comment

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

  • goes with the screen

@rburchell
Copy link
Contributor

generally looks ok. please also drop the qt4-specific code, if you've some spare time -- this branch is qt5-only (even though it's still littered with conditionals)

@@ -66,9 +62,8 @@ class MDeclarativeInputContextPrivate
MDeclarativeInputContextPrivate(MDeclarativeInputContext *qq);
~MDeclarativeInputContextPrivate();

#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)

Copy link

Choose a reason for hiding this comment

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

Extra newline (just to tell you I reviewed it :D)

@sledges
Copy link

sledges commented Oct 10, 2013

LGTM after cosmetics

Style

Removed old Qt4 code, MDeclarativeScreenPrivate::physicalOrientation now uses QScreen

Cosmetics
sledges added a commit that referenced this pull request Oct 10, 2013
Connect to QScreen for orientation change updates
@sledges sledges merged commit 6d0175e into nemomobile:qtquick2 Oct 10, 2013
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.

None yet

4 participants