Skip to content
This repository was archived by the owner on May 30, 2023. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ariya/phantomjs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: proofme/phantomjs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 11 files changed
  • 6 contributors

Commits on May 15, 2016

  1. Upgrade 3rd party dependencies

    @vitallium
    vitallium committed May 15, 2016
    Configuration menu
    Copy the full SHA
    e1b123d View commit details
    Browse the repository at this point in the history

Commits on May 18, 2016

  1. Upgrade QtBase to 5.6.0

    @vitallium
    vitallium committed May 18, 2016
    Configuration menu
    Copy the full SHA
    e98b8d4 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2016

  1. Upgrade QtWebkit 5.6.1

    @vitallium
    vitallium committed May 19, 2016
    Configuration menu
    Copy the full SHA
    b9e36f8 View commit details
    Browse the repository at this point in the history

  2. Bump Qt version 

    Do a small cleanup also.

Issue: #14102
    @vitallium
    vitallium committed May 19, 2016
    Configuration menu
    Copy the full SHA
    0c815a0 View commit details
    Browse the repository at this point in the history

  3. Disable QPA platform guard 

    We use our own platform plugin for now, but Qt doesn't
recognize it. We have to disable QPA guard to allow building
with it.

Issue: #14295
    @vitallium
    vitallium committed May 19, 2016
    Configuration menu
    Copy the full SHA
    d42ddc8 View commit details
    Browse the repository at this point in the history

  4. Handle QtInfoMsg

    @vitallium
    vitallium committed May 19, 2016
    Configuration menu
    Copy the full SHA
    f6b508d View commit details
    Browse the repository at this point in the history

  5. Fix building with MSVC2015

    @vitallium
    vitallium committed May 19, 2016
    Configuration menu
    Copy the full SHA
    5d99f2a View commit details
    Browse the repository at this point in the history

Commits on May 26, 2016

  1. Update QtWebkit module 

    This update fixes the static build on OS X
    @vitallium
    vitallium committed May 26, 2016
    Configuration menu
    Copy the full SHA
    afad160 View commit details
    Browse the repository at this point in the history

  2. Fixed typo 

    Closes gh-14282
    @radarhere @ariya
    radarhere authored and ariya committed May 26, 2016
    Configuration menu
    Copy the full SHA
    130b1f8 View commit details
    Browse the repository at this point in the history

  3. Upgrade example to run with Jasmine 2.4.1 

    #14280
    @tntim96 @ariya
    tntim96 authored and ariya committed May 26, 2016
    Configuration menu
    Copy the full SHA
    e4161c7 View commit details
    Browse the repository at this point in the history

  4. Fix 'qt_config' problem. 

    Fixes #14101
    @zhegexiaohuozi @ariya
    zhegexiaohuozi authored and ariya committed May 26, 2016
    Configuration menu
    Copy the full SHA
    1b09bdb View commit details
    Browse the repository at this point in the history

  5. Update request error message. 

    Probably related to the new Qt (#14102)
    @ariya
    ariya committed May 26, 2016
    Configuration menu
    Copy the full SHA
    59e2e90 View commit details
    Browse the repository at this point in the history

  6. Update build.py to disable qtbase/qtwebkit unwanted features 

    Closes #14133
    @glensc @ariya
    glensc authored and ariya committed May 26, 2016
    Configuration menu
    Copy the full SHA
    ad25fff View commit details
    Browse the repository at this point in the history

  7. [OS X] Allow building with custom OpenSSL library 

    Fixes #13932
    @ariya
    ariya committed May 26, 2016
    Configuration menu
    Copy the full SHA
    6090f54 View commit details
    Browse the repository at this point in the history
Loading