From 74883f8af413616bedc9defeccd2406e45827acc Mon Sep 17 00:00:00 2001 From: nowrep Date: Tue, 4 Mar 2014 14:40:43 +0100 Subject: [PATCH] [Building] Use QZ_DESTDIR variable for $SRC/bin directory Should fix problems with shadow builds. Closes #1252 --- CHANGELOG | 5 +++-- src/defines.pri | 1 + src/install.pri | 12 +++++++----- src/lib/lib.pro | 3 ++- src/main/main.pro | 11 ++++++----- src/plugins.pri | 10 +++++----- .../AccessKeysNavigation/AccessKeysNavigation.pro | 1 + src/plugins/AutoScroll/AutoScroll.pro | 9 +++++---- .../GnomeKeyringPasswords/GnomeKeyringPasswords.pro | 1 + src/plugins/GreaseMonkey/GreaseMonkey.pro | 1 + src/plugins/KWalletPasswords/KWalletPasswords.pro | 1 + src/plugins/MouseGestures/MouseGestures.pro | 1 + src/plugins/PIM/PIM.pro | 1 + src/plugins/StatusBarIcons/StatusBarIcons.pro | 1 + src/plugins/TestPlugin/TestPlugin.pro | 1 + 15 files changed, 37 insertions(+), 22 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index ca38d149f..33c7d7fc1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/src/defines.pri b/src/defines.pri index 58b73562b..007fcc1ba 100644 --- a/src/defines.pri +++ b/src/defines.pri @@ -1,4 +1,5 @@ DESTDIR = $$PWD/../bin +QZ_DESTDIR = $$DESTDIR OBJECTS_DIR = $$PWD/../build MOC_DIR = $$PWD/../build RCC_DIR = $$PWD/../build diff --git a/src/install.pri b/src/install.pri index cd33d82f2..11792079b 100644 --- a/src/install.pri +++ b/src/install.pri @@ -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 diff --git a/src/lib/lib.pro b/src/lib/lib.pro index 9be3589a7..3de7efae9 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -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) diff --git a/src/main/main.pro b/src/main/main.pro index bb28696ea..cb435c10c 100644 --- a/src/main/main.pro +++ b/src/main/main.pro @@ -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 diff --git a/src/plugins.pri b/src/plugins.pri index 3e487e510..496a19ae9 100644 --- a/src/plugins.pri +++ b/src/plugins.pri @@ -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 diff --git a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro index aef02218c..2bb9f8e2c 100644 --- a/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro +++ b/src/plugins/AccessKeysNavigation/AccessKeysNavigation.pro @@ -61,4 +61,5 @@ TRANSLATIONS += \ translations/zh_CN.ts \ translations/zh_TW.ts \ +PLUGIN_DIR = $$PWD include(../../plugins.pri) diff --git a/src/plugins/AutoScroll/AutoScroll.pro b/src/plugins/AutoScroll/AutoScroll.pro index 262450a36..d0049d250 100644 --- a/src/plugins/AutoScroll/AutoScroll.pro +++ b/src/plugins/AutoScroll/AutoScroll.pro @@ -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) diff --git a/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro b/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro index c043a7ba8..30cb0897c 100644 --- a/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro +++ b/src/plugins/GnomeKeyringPasswords/GnomeKeyringPasswords.pro @@ -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) diff --git a/src/plugins/GreaseMonkey/GreaseMonkey.pro b/src/plugins/GreaseMonkey/GreaseMonkey.pro index 45f307407..35db725b6 100644 --- a/src/plugins/GreaseMonkey/GreaseMonkey.pro +++ b/src/plugins/GreaseMonkey/GreaseMonkey.pro @@ -81,4 +81,5 @@ TRANSLATIONS += \ translations/zh_CN.ts \ translations/zh_TW.ts \ +PLUGIN_DIR = $$PWD include(../../plugins.pri) diff --git a/src/plugins/KWalletPasswords/KWalletPasswords.pro b/src/plugins/KWalletPasswords/KWalletPasswords.pro index dc7e9da1d..ddaf94346 100644 --- a/src/plugins/KWalletPasswords/KWalletPasswords.pro +++ b/src/plugins/KWalletPasswords/KWalletPasswords.pro @@ -45,4 +45,5 @@ TRANSLATIONS += \ LIBS += -lkdeui +PLUGIN_DIR = $$PWD include(../../plugins.pri) diff --git a/src/plugins/MouseGestures/MouseGestures.pro b/src/plugins/MouseGestures/MouseGestures.pro index ed3861ca4..b9bd1a284 100644 --- a/src/plugins/MouseGestures/MouseGestures.pro +++ b/src/plugins/MouseGestures/MouseGestures.pro @@ -63,4 +63,5 @@ TRANSLATIONS += \ translations/zh_CN.ts \ translations/zh_TW.ts \ +PLUGIN_DIR = $$PWD include(../../plugins.pri) diff --git a/src/plugins/PIM/PIM.pro b/src/plugins/PIM/PIM.pro index 50dfe45c6..97088c3c9 100644 --- a/src/plugins/PIM/PIM.pro +++ b/src/plugins/PIM/PIM.pro @@ -54,4 +54,5 @@ TRANSLATIONS += \ translations/zh_CN.ts \ translations/zh_TW.ts \ +PLUGIN_DIR = $$PWD include(../../plugins.pri) diff --git a/src/plugins/StatusBarIcons/StatusBarIcons.pro b/src/plugins/StatusBarIcons/StatusBarIcons.pro index 9fda51915..2ac731d11 100644 --- a/src/plugins/StatusBarIcons/StatusBarIcons.pro +++ b/src/plugins/StatusBarIcons/StatusBarIcons.pro @@ -62,4 +62,5 @@ FORMS += \ sbi_networkicondialog.ui \ sbi_settingsdialog.ui +PLUGIN_DIR = $$PWD include(../../plugins.pri) diff --git a/src/plugins/TestPlugin/TestPlugin.pro b/src/plugins/TestPlugin/TestPlugin.pro index f0f626f0d..6a452bc13 100644 --- a/src/plugins/TestPlugin/TestPlugin.pro +++ b/src/plugins/TestPlugin/TestPlugin.pro @@ -54,4 +54,5 @@ TRANSLATIONS += \ translations/zh_CN.ts \ translations/zh_TW.ts \ +PLUGIN_DIR = $$PWD include(../../plugins.pri)