This repository has been archived by the owner on May 30, 2023. It is now read-only.
Fix remote inspector when building statically. #291
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
For some reason, it seems that checking CONFIG(static) inside src/phantomjs.pro is not reliable. That caused the STATIC_BUILD define not to be set, and hence Q_INIT_RESOURCE would never get called in main.cpp. Instead of using Q_INIT_RESOURCE, let's just compile the resources directly into the phantomjs binary. This means we don't need to detect whether Qt is linked statically or dynamically. https://code.google.com/p/phantomjs/issues/detail?id=430
ariya
added a commit
that referenced
this pull request
Jul 7, 2012
Fix remote inspector when building statically.
detro
added a commit
that referenced
this pull request
Jan 5, 2014
CHANGELOG for v1.1.0 (https://github.com/detro/ghostdriver/issues?labels=1.1.0&state=closed) JavaScript Driver (Core) * ENHANCEMENT: `/maximize` window will set the window size to 1336x768, currently most common resolution online (see http://gs.statcounter.com/#resolution-ww-monthly-201307-201312) * ENHANCEMENT #275: Implemented Browser and Network (HAR) Logging types * FIXED #284: Attempt to wait for Page to Load if input causes form submit * FIXED #291: Throw exception when attempting to set invalid timeout value * FIXED #259: Fix issue regarding mouse clicks * ENHANCEMENT #290: Enabled support for "Keep Alive" HTTP connections * ENHANCEMENT #262: Allow access to PhantomJS API from WebDriver (Driver part) * ENHANCEMENT #293: Import Selenium 2.39.0 WebDriver Atoms Java Binding * MINOR #251: Minor compilation issues for Binding * ENHANCEMENT #262: Allow access to PhantomJS API from WebDriver (Java Binding part) Tested using GhostDriver validation tests (https://github.com/detro/ghostdriver/tree/master/test). #11877
detro
added a commit
that referenced
this pull request
Jan 19, 2014
CHANGELOG for v1.1.0 (https://github.com/detro/ghostdriver/issues?labels=1.1.0&state=closed) JavaScript Driver (Core) * ENHANCEMENT: `/maximize` window will set the window size to 1336x768, currently most common resolution online (see http://gs.statcounter.com/#resolution-ww-monthly-201307-201312) * ENHANCEMENT #275: Implemented Browser and Network (HAR) Logging types * FIXED #284: Attempt to wait for Page to Load if input causes form submit * FIXED #291: Throw exception when attempting to set invalid timeout value * FIXED #259: Fix issue regarding mouse clicks * ENHANCEMENT #290: Enabled support for "Keep Alive" HTTP connections * ENHANCEMENT #262: Allow access to PhantomJS API from WebDriver (Driver part) * ENHANCEMENT #293: Import Selenium 2.39.0 WebDriver Atoms Java Binding * MINOR #251: Minor compilation issues for Binding * ENHANCEMENT #262: Allow access to PhantomJS API from WebDriver (Java Binding part) Tested using GhostDriver validation tests (https://github.com/detro/ghostdriver/tree/master/test). #11877
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
For some reason, it seems that checking CONFIG(static) inside
src/phantomjs.pro is not reliable. That caused the STATIC_BUILD define
not to be set, and hence Q_INIT_RESOURCE would never get called in
main.cpp.
Instead of using Q_INIT_RESOURCE, let's just compile the resources
directly into the phantomjs binary. This means we don't need to detect
whether Qt is linked statically or dynamically.
https://code.google.com/p/phantomjs/issues/detail?id=430
(I have manage to make a static build on Linux to reproduce this issue - PR for that coming up - but I haven't been able to verify this fix on OS X. I am pretty sure that it works, but it would be worth verifying. Also, please cherry-pick to the 1.6 branch?)