Permalink
Browse files

Moved qxtvars.prf under features/ to avoid qmake warnings when buildi…

…ng examples
  • Loading branch information...
1 parent 80a4a3b commit d4ef3ecdb1380095b96969f26dfc854d4fab664c jpnurmi committed Nov 26, 2010
Showing with 8 additions and 6 deletions.
  1. +2 −1 configure
  2. +5 −4 configure.bat
  3. +1 −1 libqxt.pro
View
@@ -25,13 +25,14 @@ fi
QXT_SOURCE_TREE=`dirname $0`
QXT_SOURCE_TREE=`(cd "$QXT_SOURCE_TREE"; /bin/pwd)`
QXT_BUILD_TREE=`/bin/pwd`
+[ ! -d $QXT_BUILD_TREE/features ] && mkdir $QXT_BUILD_TREE/features
[ ! -d $QXT_BUILD_TREE/examples ] && mkdir $QXT_BUILD_TREE/examples
[ ! -d $QXT_BUILD_TREE/tests ] && mkdir $QXT_BUILD_TREE/tests
# output files
CONFIG_LOG=$QXT_BUILD_TREE/config.log
QMAKE_CACHE=$QXT_BUILD_TREE/.qmake.cache
-QXT_VARS=$QXT_BUILD_TREE/qxtvars.prf
+QXT_VARS=$QXT_BUILD_TREE/features/qxtvars.prf
[ -f $CONFIG_LOG ] && mv $CONFIG_LOG $CONFIG_LOG.bak
[ -f $QMAKE_CACHE ] && mv $QMAKE_CACHE $QMAKE_CACHE.bak
[ -f $QXT_VARS ] && mv $QXT_VARS $QXT_VARS.bak
View
@@ -23,16 +23,17 @@ set QXT_BUILD_TREE=%CD%
cd "%0\..\"
SET QXT_SOURCE_TREE=%CD%
cd %QXT_BUILD_TREE%
-if not exist %QXT_BUILD_TREE%\examples mkdir %QXT_BUILD_TREE%\examples 2>&1 >NUL 2>&1
-if not exist %QXT_BUILD_TREE%\tests mkdir %QXT_BUILD_TREE%\tests 2>&1 >NUL 2>&1
+if not exits %QXT_BUILD_TREE%\features mkdir %QXT_BUILD_TREE%\features >NUL 2>&1
+if not exist %QXT_BUILD_TREE%\examples mkdir %QXT_BUILD_TREE%\examples >NUL 2>&1
+if not exist %QXT_BUILD_TREE%\tests mkdir %QXT_BUILD_TREE%\tests >NUL 2>&1
@rem -- output files
set CONFIG_LOG=%QXT_BUILD_TREE%\config.log
set QMAKE_CACHE=%QXT_BUILD_TREE%\.qmake.cache
-set QXT_VARS=%QXT_BUILD_TREE%\qxtvars.prf
+set QXT_VARS=%QXT_BUILD_TREE%\features\qxtvars.prf
if exist %CONFIG_LOG% move %CONFIG_LOG% %CONFIG_LOG%.bak >NUL 2>&1
if exist %QMAKE_CACHE% move %QMAKE_CACHE% %QMAKE_CACHE%.bak >NUL 2>&1
-if exist %QXT_VARS% move %QXT_VARS% %QXT_VARS%.bak 2>&1 >NUL 2>&1
+if exist %QXT_VARS% move %QXT_VARS% %QXT_VARS%.bak >NUL 2>&1
@rem -- defaults
echo CONFIG += silent > %QMAKE_CACHE%
View
@@ -76,7 +76,7 @@ contains( QXT_MODULES, web ){
}
features.path = $$QXT_INSTALL_FEATURES
-features.files = $$QXT_SOURCE_TREE/features/qxt.prf $$QXT_BUILD_TREE/qxtvars.prf
+features.files = $$QXT_SOURCE_TREE/features/qxt.prf $$QXT_BUILD_TREE/features/qxtvars.prf
INSTALLS += features
style.CONFIG = recursive

0 comments on commit d4ef3ec

Please sign in to comment.