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

Minor touches that make life easier #32

Merged
ariya merged 2 commits into from
Apr 19, 2011
Merged

Minor touches that make life easier #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa0314a
Some extra ".gitignore" options.
detro Apr 19, 2011
4f1fbb3
Commented out flags for "phantomjs.pro" that can be useful to have at…
detro Apr 19, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
.DS_Store
*.pro.user*
*.xcodeproj
Makefile*
bin/
*~
5 changes: 5 additions & 0 deletions src/phantomjs.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ TEMPLATE = app
TARGET = phantomjs
QT += network webkit
CONFIG += console

# Comment to enable Debug Messages
DEFINES += QT_NO_DEBUG_OUTPUT

DESTDIR = ../bin
Expand All @@ -25,3 +27,6 @@ include(gif/gif.pri)

win32: RC_FILE = phantomjs_win.rc
os2: RC_FILE = phantomjs_os2.rc

# Uncomment to build a Mac OS X Universal Binary (i.e. x86 + ppc)
#mac: CONFIG += x86 ppc