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

Commit

Permalink
No X11 requirement on Linux.
Browse files Browse the repository at this point in the history 
This is achieved by using QPA (aka Qt Lighthouse).

http://code.google.com/p/phantomjs/issues/detail?id=163
  • Loading branch information
@ariya
ariya committed Mar 14, 2012
1 parent c78ae19 commit 6c8a1c2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
7 changes: 5 additions & 2 deletions src/qt/preconfig.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ QT_CFG+=' -opensource' # Use the open-source license
QT_CFG+=' -confirm-license' # Silently acknowledge the license confirmation
QT_CFG+=' -v' # Makes it easier to see what header dependencies are missing

# Static build on Mac OS X only
if [[ $OSTYPE = darwin* ]]; then
QT_CFG+=' -static'
QT_CFG+=' -static' # Static build on Mac OS X only
QT_CFG+=' -arch x86'
QT_CFG+=' -cocoa' # Cocoa only, ignore Carbon
QT_CFG+=' -no-dwarf2'
else
QT_CFG+=' -system-freetype' # Freetype for text rendering
QT_CFG+=' -fontconfig' # Fontconfig for better font matching
QT_CFG+=' -qpa' # X11-less with QPA (aka Lighthouse)
fi

QT_CFG+=' -release' # Build only for release (no debugging support)
Expand Down
7 changes: 5 additions & 2 deletions tools/preconfig.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ QT_CFG+=' -opensource' # Use the open-source license
QT_CFG+=' -confirm-license' # Silently acknowledge the license confirmation
QT_CFG+=' -v' # Makes it easier to see what header dependencies are missing

# Static build on Mac OS X only
if [[ $OSTYPE = darwin* ]]; then
QT_CFG+=' -static'
QT_CFG+=' -static' # Static build on Mac OS X only
QT_CFG+=' -arch x86'
QT_CFG+=' -cocoa' # Cocoa only, ignore Carbon
QT_CFG+=' -no-dwarf2'
else
QT_CFG+=' -system-freetype' # Freetype for text rendering
QT_CFG+=' -fontconfig' # Fontconfig for better font matching
QT_CFG+=' -qpa' # X11-less with QPA (aka Lighthouse)
fi

QT_CFG+=' -release' # Build only for release (no debugging support)
Expand Down

1 comment on commit 6c8a1c2

@niftylettuce
Copy link

Choose a reason for hiding this comment

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

Awesome!

Please sign in to comment.