1
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-24 04:36:34 +01:00

Added support for "make install" on Unix. Closes issue #2

This commit is contained in:
nowrep 2011-10-11 19:54:20 +02:00
parent c9113ccd1d
commit 10c36a5330
10 changed files with 57 additions and 23 deletions

3
.gitignore vendored
View File

@ -10,3 +10,6 @@ Makefile*
TestPlugin-build TestPlugin-build
search_* search_*
src-* src-*
bin/qupzilla
bin/plugins/libExamplePlugin.so
*.autosave

View File

@ -1 +1,5 @@
nowrep <nowrep@gmail.com> nowrep <nowrep@gmail.com>
Contributors:
Heimen Stoffels <vistausss@gmail.com> - Dutch Translation
Peter Vacula <pvacula1989@gmail.com> - Slovak Translation

View File

@ -54,7 +54,7 @@
Windows specific defines Windows specific defines
W7API Build QupZilla with Windows 7 API support W7API Build QupZilla with Windows 7 API support
Requires Microsoft Visual C++ Compiler 2010 Requires Microsoft Visual C++ Compiler 2010
(enabled by default) (disabled by default)
Linux / Unix specific defines: Linux / Unix specific defines:
NO_SYSTEM_DATAPATH By default, QupZilla is using /usr/share/qupzilla/ path NO_SYSTEM_DATAPATH By default, QupZilla is using /usr/share/qupzilla/ path

11
README
View File

@ -3,6 +3,17 @@
################################# #################################
Version: 1.0.0-rc1 Version: 1.0.0-rc1
Windows:
use precompiled windows installer in downloads
Unix:
cd src/
qmake
make
make install
You may need to run make install as root.
NOTE: Before building, please read BUILDING informations. Thank You! NOTE: Before building, please read BUILDING informations. Thank You!
QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org

1
TODO
View File

@ -13,3 +13,4 @@ Note: They are not sorted by priority.
5. Zoom Widget in statusbar 5. Zoom Widget in statusbar
6. Save more than one account for site + input completer 6. Save more than one account for site + input completer
7. Better SSL Manager 7. Better SSL Manager
8. Accept-Language dialog + send this header

1
bin/.gitignore vendored
View File

@ -1 +0,0 @@
qupzilla

View File

@ -1 +0,0 @@
libExamplePlugin.so

View File

@ -0,0 +1,15 @@
[Desktop Entry]
Encoding=UTF-8
Name=QupZilla
Comment=A fast and secure web browser
Comment[cs]=Rychlý a bezpečný webový prohlížeč
Comment[sk]=Rychlý a bezpečný webový prehliadač
GenericName=Web Browser
GenericName[cs]=Webový prohlížeč
GenericName[sk]=Webový prehliadač
Exec=qupzilla %u
MimeType=text/html;application/xhtml+xml;
Terminal=false
Type=Application
Icon=qupzilla.png
Categories=Network;WebBrowser;

BIN
linux/pixmaps/qupzilla.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.2 KiB

View File

@ -15,17 +15,22 @@ MOC_DIR = ../build
RCC_DIR = ../build RCC_DIR = ../build
UI_DIR = ../build UI_DIR = ../build
##It won't compile on windows with this define # Please read BUILD informations #
##Some bug in qtsingleapp / qvector template #win32:DEFINES += UNRELEASED_BUILD
!win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT #win32:DEFINES += NO_SYSTEM_DATAPATH
#win32:DEFINES += W7API
unix:QT += dbus unix:QT += dbus
win32:DEFINES += W7API
win32:RC_FILE = appicon.rc win32:RC_FILE = appicon.rc
win32:LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib win32:LIBS += User32.lib Ole32.lib Shell32.lib ShlWapi.lib Gdi32.lib ComCtl32.lib
##It won't compile on windows with this define. Some bug in qtsingleapp / qvector template
!win32: !CONFIG(debug, debug|release): DEFINES += QT_NO_DEBUG_OUTPUT
TRANSLATIONS +=cs_CZ.ts\ TRANSLATIONS +=cs_CZ.ts\
sk_SK.ts sk_SK.ts\
nl_NL.ts\
es.ts
INCLUDEPATH += 3rdparty\ INCLUDEPATH += 3rdparty\
app\ app\
@ -286,21 +291,18 @@ OTHER_FILES += \
include(3rdparty/qtsingleapplication.pri) include(3rdparty/qtsingleapplication.pri)
unix {
target.path = /usr/bin
target1.files = ../bin/data
target1.files += ../bin/locale
target1.files += ../bin/plugins
target1.files += ../bin/themes
target1.path = /usr/share/qupzilla
target2.files = ../linux/applications
target2.files += ../linux/pixmaps
target2.path = /usr/share
INSTALLS += target target1 target2
}