From 3017ca500bea98409a336e98e382b8bef1f08fce Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Wed, 10 Oct 2007 13:02:54 +0000 Subject: [PATCH 1/1] We put the project-wide value of CONFIG in build/buildconf.pri now, in order to quickly change the build configuration (and no longer rely on platform-dependend default values for CONFIG) --- build/buildconf.pri | 2 ++ build/modules/module.pri | 2 ++ build/quassel.pro | 3 ++- build/targets/target.pri | 2 ++ 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 build/buildconf.pri diff --git a/build/buildconf.pri b/build/buildconf.pri new file mode 100644 index 00000000..c2321493 --- /dev/null +++ b/build/buildconf.pri @@ -0,0 +1,2 @@ +CONFIG = release warn_on uic resources qt +# CONFIG += incremental link_prl nostrip qt_no_framework diff --git a/build/modules/module.pri b/build/modules/module.pri index 6be89a87..900f3037 100644 --- a/build/modules/module.pri +++ b/build/modules/module.pri @@ -1,6 +1,8 @@ # module.pri # This file is included by module project files. +include(../buildconf.pri) + TEMPLATE = lib CONFIG += staticlib diff --git a/build/quassel.pro b/build/quassel.pro index 7ce23875..5be5fde2 100644 --- a/build/quassel.pro +++ b/build/quassel.pro @@ -15,7 +15,8 @@ # Set project-wide config options -CONFIG += qt debug warn_on + +#CONFIG = qt warn_on release TEMPLATE = subdirs diff --git a/build/targets/target.pri b/build/targets/target.pri index 611b5c95..b7e55280 100644 --- a/build/targets/target.pri +++ b/build/targets/target.pri @@ -1,5 +1,7 @@ TEMPLATE = app +include(../buildconf.pri) + RESOURCES += ../../i18n/i18n.qrc \ ../../src/images/icons.qrc -- 2.20.1