From 10c36a5330b9cb2d8be3f92771a9edc2c2144e92 Mon Sep 17 00:00:00 2001 From: nowrep Date: Tue, 11 Oct 2011 19:54:20 +0200 Subject: [PATCH] Added support for "make install" on Unix. Closes issue #2 --- .gitignore | 3 ++ AUTHORS | 4 +++ BUILDING | 2 +- README | 11 ++++++++ TODO | 1 + bin/.gitignore | 1 - bin/plugins/.gitignore | 1 - linux/applications/qupzilla.desktop | 15 ++++++++++ linux/pixmaps/qupzilla.png | Bin 0 -> 7417 bytes src/QupZilla.pro | 42 +++++++++++++++------------- 10 files changed, 57 insertions(+), 23 deletions(-) delete mode 100644 bin/.gitignore delete mode 100644 bin/plugins/.gitignore create mode 100644 linux/applications/qupzilla.desktop create mode 100644 linux/pixmaps/qupzilla.png diff --git a/.gitignore b/.gitignore index 8698d7ecb..c623549e3 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,6 @@ Makefile* TestPlugin-build search_* src-* +bin/qupzilla +bin/plugins/libExamplePlugin.so +*.autosave diff --git a/AUTHORS b/AUTHORS index 27d51ef84..fc5616e56 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,5 @@ nowrep + +Contributors: +Heimen Stoffels - Dutch Translation +Peter Vacula - Slovak Translation diff --git a/BUILDING b/BUILDING index 37b497204..b2a65800e 100644 --- a/BUILDING +++ b/BUILDING @@ -54,7 +54,7 @@ Windows specific defines W7API Build QupZilla with Windows 7 API support Requires Microsoft Visual C++ Compiler 2010 - (enabled by default) + (disabled by default) Linux / Unix specific defines: NO_SYSTEM_DATAPATH By default, QupZilla is using /usr/share/qupzilla/ path diff --git a/README b/README index c08d9812c..1d4d03a83 100644 --- a/README +++ b/README @@ -3,6 +3,17 @@ ################################# 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! QupZilla is new and very fast open source browser based on WebKit core http://www.webkit.org diff --git a/TODO b/TODO index 45f82e09c..824c0c1e0 100644 --- a/TODO +++ b/TODO @@ -13,3 +13,4 @@ Note: They are not sorted by priority. 5. Zoom Widget in statusbar 6. Save more than one account for site + input completer 7. Better SSL Manager +8. Accept-Language dialog + send this header diff --git a/bin/.gitignore b/bin/.gitignore deleted file mode 100644 index 650c516a6..000000000 --- a/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -qupzilla diff --git a/bin/plugins/.gitignore b/bin/plugins/.gitignore deleted file mode 100644 index 07f9dae00..000000000 --- a/bin/plugins/.gitignore +++ /dev/null @@ -1 +0,0 @@ -libExamplePlugin.so diff --git a/linux/applications/qupzilla.desktop b/linux/applications/qupzilla.desktop new file mode 100644 index 000000000..e282c3c63 --- /dev/null +++ b/linux/applications/qupzilla.desktop @@ -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; diff --git a/linux/pixmaps/qupzilla.png b/linux/pixmaps/qupzilla.png new file mode 100644 index 0000000000000000000000000000000000000000..c4856bed55c12b5685a356eab40b4490486b9dd1 GIT binary patch literal 7417 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 literal 0 HcmV?d00001 diff --git a/src/QupZilla.pro b/src/QupZilla.pro index e4093a77c..f0cec0a8c 100644 --- a/src/QupZilla.pro +++ b/src/QupZilla.pro @@ -15,17 +15,22 @@ MOC_DIR = ../build RCC_DIR = ../build UI_DIR = ../build -##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 +# Please read BUILD informations # +#win32:DEFINES += UNRELEASED_BUILD +#win32:DEFINES += NO_SYSTEM_DATAPATH +#win32:DEFINES += W7API unix:QT += dbus -win32:DEFINES += W7API win32:RC_FILE = appicon.rc 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\ - sk_SK.ts + sk_SK.ts\ + nl_NL.ts\ + es.ts INCLUDEPATH += 3rdparty\ app\ @@ -286,21 +291,18 @@ OTHER_FILES += \ 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 +}