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 5
    • Merge Requests 5
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Jobs
  • Commits
  • mer-core
  • qtbase
  • Merge Requests
  • !52

Open
Opened Dec 02, 2019 by flypig@flypig
  • Report abuse
Report abuse

WIP: Fix broken QNAM::networkAccessible()

  • Overview 2
  • Commits 1
  • Changes 1

This change cherry-picks d80fde62ed82493322463d2057a07b6b2ed81a83 from Qt 5.10.

When switching on/off multiple time the wifi (mainly, but not only) on
ios/macos the QNAM may wrongly stay on a NotAccessible state while the
configuration is Active.
This change make sure the QNAM::networkAccessible() is correctly
reporting the accessibility.

Task-number: QTBUG-49751
Task-number: QTBUG-58275
Task-number: QTBUG-60366
Change-Id: I238ab32030fbaa8072cce341db8da6bcfc346035
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Conflicts:
	src/network/access/qnetworkaccessmanager.cpp
Edited Dec 02, 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-cherrypick-from-5.10"
git checkout -b "flypig/qtbase-jb47349-cherrypick-from-5.10" 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-cherrypick-from-5.10"

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!52