-
Notifications
You must be signed in to change notification settings - Fork 794
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release/0.3.0' into stable
- Loading branch information
Showing
503 changed files
with
4,104 additions
and
3,219 deletions.
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| SRC_ROOT=$$PWD | ||
| BUILD_ROOT=$$shadowed($$PWD) | ||
|
|
||
| ZEAL_COMMON_PRI = $$SRC_ROOT/qmake/common.pri | ||
| ZEAL_LIBRARY_PRI = $$SRC_ROOT/qmake/library.pri |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,9 @@ | ||
| before_install: | ||
| - shippable_retry sudo apt-get -y -qq update | ||
| install: | ||
| - shippable_retry sudo apt-get -y -qq install --no-install-recommends qt5-default libqt5webkit5-dev libqt5x11extras5-dev libarchive-dev libxcb-keysyms1-dev | ||
| script: | ||
| - qmake | ||
| - make | ||
| language: c | ||
| compiler: | ||
| - gcc | ||
| build: | ||
| ci: | ||
| - shippable_retry sudo apt-get -y -qq update | ||
| - shippable_retry sudo apt-get -y -qq install --no-install-recommends qt5-default libqt5webkit5-dev libqt5x11extras5-dev libarchive-dev libxcb-keysyms1-dev | ||
| - qmake | ||
| - make |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| include($$ZEAL_COMMON_PRI) | ||
|
|
||
| TEMPLATE = aux | ||
|
|
||
| unix:!macx { | ||
| TARGET = zeal | ||
| appicons16.files=freedesktop/appicons/16/* | ||
| appicons24.files=freedesktop/appicons/24/* | ||
| appicons32.files=freedesktop/appicons/32/* | ||
| appicons64.files=freedesktop/appicons/64/* | ||
| appicons128.files=freedesktop/appicons/128/* | ||
|
|
||
| appicons16.path=$$PREFIX/share/icons/hicolor/16x16/apps | ||
| appicons24.path=$$PREFIX/share/icons/hicolor/24x24/apps | ||
| appicons32.path=$$PREFIX/share/icons/hicolor/32x32/apps | ||
| appicons64.path=$$PREFIX/share/icons/hicolor/64x64/apps | ||
| appicons128.path=$$PREFIX/share/icons/hicolor/128x128/apps | ||
|
|
||
| desktop.files=freedesktop/zeal.desktop | ||
| desktop.path=$$PREFIX/share/applications | ||
|
|
||
| INSTALLS += appicons16 appicons24 appicons32 appicons64 appicons128 desktop | ||
| } |
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| # Shared build options | ||
| # | ||
| # This file must be included at the top of every non-subdirs .pro file. | ||
| # Use: | ||
| # include($$ZEAL_COMMON_PRI) | ||
|
|
||
| # Compilation settings | ||
| CONFIG += c++11 silent | ||
|
|
||
| # Shared include path | ||
| INCLUDEPATH += $$SRC_ROOT/src/libs | ||
| LIBS = -L$$BUILD_ROOT/.lib | ||
|
|
||
| # QString options | ||
| DEFINES *= QT_USE_QSTRINGBUILDER | ||
| DEFINES *= QT_RESTRICTED_CAST_FROM_ASCII | ||
| DEFINES *= QT_NO_CAST_TO_ASCII | ||
| DEFINES *= QT_NO_URL_CAST_FROM_STRING | ||
|
|
||
| # Workaround for AppVeyor: Do not warn if the library had to be created. | ||
| # Based on https://codereview.qt-project.org/150326 | ||
| win32-g++:lessThan(QT_VERSION, "5.6.0") { | ||
| QMAKE_LIB = ar -rc | ||
| } | ||
|
|
||
| # Keep build directory clean | ||
| MOC_DIR = $$BUILD_ROOT/.moc | ||
| OBJECTS_DIR = $$BUILD_ROOT/.obj | ||
| RCC_DIR = $$BUILD_ROOT/.rcc | ||
| UI_DIR = $$BUILD_ROOT/.ui | ||
|
|
||
| # Application version | ||
| VERSION = 0.3.0 | ||
| DEFINES += ZEAL_VERSION=\\\"$${VERSION}\\\" | ||
|
|
||
| # Browser engine | ||
| CONFIG(zeal_qtwebengine) { | ||
| qtHaveModule(webenginewidgets): BROWSER_ENGINE = qtwebengine | ||
| else: error("Qt WebEngine is not available.") | ||
| } else { | ||
| qtHaveModule(webkitwidgets): BROWSER_ENGINE = qtwebkit | ||
| else: qtHaveModule(webenginewidgets): BROWSER_ENGINE = qtwebengine | ||
| else: error("Zeal requires Qt WebEngine or Qt WebKit.") | ||
| } | ||
|
|
||
| equals(BROWSER_ENGINE, qtwebengine) { | ||
| message("Browser engine: Qt WebEngine.") | ||
| QT += webenginewidgets | ||
| DEFINES += USE_WEBENGINE | ||
| } else { | ||
| message("Browser engine: Qt WebKit.") | ||
| QT += webkitwidgets | ||
| DEFINES += USE_WEBKIT | ||
| } | ||
|
|
||
| # Portable build | ||
| CONFIG(zeal_portable) { | ||
| message("Portable build: Yes.") | ||
| DEFINES += PORTABLE_BUILD | ||
| } | ||
|
|
||
| # Unix installation prefix | ||
| unix:!macx { | ||
| isEmpty(PREFIX): PREFIX = /usr | ||
| } |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| include($$ZEAL_COMMON_PRI) | ||
| include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1.pri)) | ||
|
|
||
| TEMPLATE = lib | ||
| CONFIG += staticlib | ||
|
|
||
| DESTDIR = $$BUILD_ROOT/.lib | ||
| TARGET = $$ZEAL_LIB_NAME |
This file was deleted.
Oops, something went wrong.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| include($$ZEAL_COMMON_PRI) | ||
|
|
||
| TEMPLATE = app | ||
|
|
||
| QT += gui widgets sql concurrent | ||
|
|
||
| SOURCES += \ | ||
| main.cpp | ||
|
|
||
| RESOURCES += \ | ||
| resources/zeal.qrc | ||
|
|
||
| DESTDIR = $$BUILD_ROOT/bin | ||
|
|
||
| unix:!macx { | ||
| TARGET = zeal | ||
| target.path = $$PREFIX/bin | ||
|
|
||
| INSTALLS += target | ||
| } | ||
|
|
||
| win32 { | ||
| TARGET = zeal | ||
| RC_ICONS = resources/zeal.ico | ||
| } | ||
|
|
||
| macx { | ||
| TARGET = Zeal | ||
| ICON = resources/zeal.icns | ||
| } | ||
|
|
||
| # FIXME: Hardcoded link line & cyclic dependencies. | ||
| LIBS += -lCore -lUi -lRegistry -lUtil | ||
|
|
||
| # Depend on all dependencies of libraries | ||
| for(lib_dir, $$list($$files($$SRC_ROOT/src/libs/*))) { | ||
| !equals(lib_dir, $$SRC_ROOT/src/libs/libs.pro) { | ||
| include($$lib_dir/$$basename(lib_dir).pri) | ||
| PRE_TARGETDEPS += $$BUILD_ROOT/.lib/lib$${ZEAL_LIB_NAME}.a | ||
| # LIBS += -l$$ZEAL_LIB_NAME | ||
| } | ||
| } |
Oops, something went wrong.