Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 09:42:10 +02:00
Code Releases Activity

[Building] Use QZ_DESTDIR variable for $SRC/bin directory

Browse Source 
Should fix problems with shadow builds.
Closes #1252
This commit is contained in:
nowrep 2014-03-04 14:40:43 +01:00
parent 688455158c
commit 74883f8af4
15 changed files with 37 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG
View File

@ -1,10 +1,11 @@
Version 1.7.0
* development version
* completely rewritten bookmarks (including multi-level folders support)
* menus are not closed when opening links with middle mouse button
* added new autoscroll plugin
* added support for window.onload event
* added support for external.AddSearchProvider js function
* completely rewritten bookmarks (including multi-level folders support)
* menus are not closed when opening links with middle mouse button
* support for shadow builds with Qt Creator
Version 1.6.3
* released 14 February 2014

1
src/defines.pri
View File

@ -1,4 +1,5 @@
DESTDIR = $$PWD/../bin
QZ_DESTDIR = $$DESTDIR
OBJECTS_DIR = $$PWD/../build
MOC_DIR = $$PWD/../build
RCC_DIR = $$PWD/../build

12
src/install.pri
View File

@ -1,10 +1,12 @@
include(defines.pri)
mac {
QMAKE_INFO_PLIST = $$PWD/main/Info.plist
ICON = $$PWD/lib/data/icons/exeicons/qupzilla.icns
bundle_target.files += $$PWD/../bin/locale
bundle_target.files += $$PWD/../bin/themes
bundle_target.files += $$PWD/../bin/plugins
bundle_target.files += $$QZ_DESTDIR/locale
bundle_target.files += $$QZ_DESTDIR/themes
bundle_target.files += $$QZ_DESTDIR/plugins
bundle_target.path = Contents/Resources
QMAKE_BUNDLE_DATA += bundle_target
@ -13,8 +15,8 @@ mac {
!mac:unix {
target.path = $$binary_folder
target1.files += $$PWD/../bin/locale
target1.files += $$PWD/../bin/themes
target1.files += $$QZ_DESTDIR/locale
target1.files += $$QZ_DESTDIR/themes
target1.path = $$data_folder
target2.files = $$PWD/../linux/applications/qupzilla.desktop

3
src/lib/lib.pro
View File

@ -1,3 +1,5 @@
include(../defines.pri)
isEqual(QT_MAJOR_VERSION, 5) {
QT += webkitwidgets network widgets printsupport sql script gui-private
} else {
@ -10,7 +12,6 @@ TEMPLATE = lib
DEFINES *= QUPZILLA_SHAREDLIBRARY
include(3rdparty/qtsingleapplication.pri)
include(../defines.pri)
include(../../translations/translations.pri)
include(plugins/qtwebkit/qtwebkit-plugins.pri)

11
src/main/main.pro
View File

@ -1,3 +1,5 @@
include(../defines.pri)
isEqual(QT_MAJOR_VERSION, 5) {
QT += webkitwidgets network widgets printsupport sql script
} else {
@ -9,11 +11,8 @@ mac: TARGET = QupZilla
TEMPLATE = app
!unix|mac: LIBS += -L../../bin -lQupZilla
!mac:unix: LIBS += ../../bin/libQupZilla.so
include(../defines.pri)
include(../install.pri)
!unix|mac: LIBS += -L$$QZ_DESTDIR -lQupZilla
!mac:unix: LIBS += $$QZ_DESTDIR/libQupZilla.so
unix:!contains(DEFINES, "DISABLE_DBUS") QT += dbus
@ -35,4 +34,6 @@ OTHER_FILES += appicon.rc \
os2:RC_FILE = appicon_os2.rc
win32:RC_FILE = appicon.rc
include(../install.pri)
unix:contains(DEFINES, "NO_SYSTEM_DATAPATH"): QMAKE_LFLAGS+=$${QMAKE_LFLAGS_RPATH}\\$\$ORIGIN

10
src/plugins.pri
View File

@ -50,7 +50,7 @@ DEPENDPATH += $$PWD/lib/3rdparty\
TEMPLATE = lib
CONFIG += plugin
DESTDIR = $$PWD/../bin/plugins/
DESTDIR = $$QZ_DESTDIR/plugins/
isEqual(QT_MAJOR_VERSION, 5) {
QT *= webkitwidgets network
@ -63,8 +63,8 @@ MOC_DIR = build
RCC_DIR = build
UI_DIR = build
!unix|mac: LIBS += -L$$PWD/../bin -lQupZilla
!mac:unix: LIBS += $$PWD/../bin/libQupZilla.so
!unix|mac: LIBS += -L$$QZ_DESTDIR -lQupZilla
!mac:unix: LIBS += $$QZ_DESTDIR/libQupZilla.so
!mac:unix {
target.path = $$library_folder/qupzilla
@ -73,7 +73,7 @@ UI_DIR = build
}
updateqm.input = TRANSLATIONS
updateqm.output = locale/${QMAKE_FILE_BASE}.qm
updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} -qm locale/${QMAKE_FILE_BASE}.qm
updateqm.output = $$PLUGIN_DIR/locale/${QMAKE_FILE_BASE}.qm
updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} -qm $$PLUGIN_DIR/locale/${QMAKE_FILE_BASE}.qm
updateqm.CONFIG += no_link target_predeps
QMAKE_EXTRA_COMPILERS += updateqm

1
src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro
View File

@ -61,4 +61,5 @@ TRANSLATIONS += \
translations/zh_CN.ts \
translations/zh_TW.ts \
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

9
src/plugins/AutoScroll/AutoScroll.pro
View File

@ -12,9 +12,10 @@ HEADERS += autoscrollplugin.h \
framescroller.h \
autoscrollsettings.h
RESOURCES += autoscroll.qrc
include(../../plugins.pri)
FORMS += \
autoscrollsettings.ui
RESOURCES += autoscroll.qrc
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

1
src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro
View File

@ -44,4 +44,5 @@ TRANSLATIONS += \
LIBS += $$system(pkg-config --libs gnome-keyring-1)
QMAKE_CXXFLAGS += $$system(pkg-config --cflags gnome-keyring-1)
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

1
src/plugins/GreaseMonkey/GreaseMonkey.pro
View File

@ -81,4 +81,5 @@ TRANSLATIONS += \
translations/zh_CN.ts \
translations/zh_TW.ts \
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

1
src/plugins/KWalletPasswords/KWalletPasswords.pro
View File

@ -45,4 +45,5 @@ TRANSLATIONS += \
LIBS += -lkdeui
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

1
src/plugins/MouseGestures/MouseGestures.pro
View File

@ -63,4 +63,5 @@ TRANSLATIONS += \
translations/zh_CN.ts \
translations/zh_TW.ts \
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

1
src/plugins/PIM/PIM.pro
View File

@ -54,4 +54,5 @@ TRANSLATIONS += \
translations/zh_CN.ts \
translations/zh_TW.ts \
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

1
src/plugins/StatusBarIcons/StatusBarIcons.pro
View File

@ -62,4 +62,5 @@ FORMS += \
sbi_networkicondialog.ui \
sbi_settingsdialog.ui
PLUGIN_DIR = $$PWD
include(../../plugins.pri)

1
src/plugins/TestPlugin/TestPlugin.pro
View File

@ -54,4 +54,5 @@ TRANSLATIONS += \
translations/zh_CN.ts \
translations/zh_TW.ts \
PLUGIN_DIR = $$PWD
include(../../plugins.pri)