Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
Q
qtbase
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Labels
  • Merge Requests 6
    • Merge Requests 6
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • qtbase
  • Merge Requests
  • !51

Merged
Opened Sep 24, 2019 by flypig@flypig
  • Report abuse
Report abuse

Check alternative connections when connecting

  • Overview 6
  • Commits 1
  • Changes 1

This is a reanimation of !47 (closed) for testing purposes, given !48 (merged) didn't fix things.

QNetworkAccessManager keeps track of a single connected session (e.g. Wifi, mobile data) at a time. If the currently tracked session disconnects, it checks whether any other network configuration is online, and if so, it switches to make this the current session.

However, if the currently tracked session changes to the Connecting state, QNetworkAccessManager will move into the offline state, and further changes to the connectivity of the tracked session will no longer trigger an update.

This change makes QNetworkAccessManager switch connection in case the current session moves to the Connecting state while another Active online configuration is available to use instead.

Edited Oct 07, 2019 by flypig

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://git.sailfishos.org/flypig/qtbase.git" "jb47349"
git checkout -b "flypig/qtbase-jb47349" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/mer-5.6"
git merge --no-ff "flypig/qtbase-jb47349"

Step 4. Push the result of the merge to GitLab

git push origin "mer-5.6"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
0
Labels
None
Assign labels
  • View project labels
Reference: mer-core/qtbase!51

Revert this merge request

This will create a new commit in order to revert the existing changes.

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.

Cherry-pick this merge request

Switch branch
Cancel
A new branch will be created in your fork and a new merge request will be started.