From 3bb247b8d85923f1ea373c383a6b2a8bb7b05b34 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 17 Nov 2011 16:00:12 +0100 Subject: mkspecs: Case-insensitive check of paths on Windows. Change-Id: I2b46bce79774ed9e5b5f6d73cc6e62ae50e35a5e Reviewed-by: Marius Storm-Olsen --- mkspecs/features/default_pre.prf | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'mkspecs/features/default_pre.prf') diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index be8ee1ae27..1a56787d15 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -20,13 +20,20 @@ CONFIG = lex yacc warn_on debug uic resources $$CONFIG } QTFWD = -module-fwd $$OUT_PWD/module-paths/modules -cache-module-fwd - !isEmpty(QTDIR) { + !isEmpty(QTDIR):exists($$QTDIR/.qmake.cache) { # Only if QTDIR points to an actual build directory # and this build directory is the install directory # can we tell syncqt to do a -developer-build - exists($$QTDIR/.qmake.cache):contains(QTDIR, $$[QT_INSTALL_PREFIX]) { - QTFWD = -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build + win32 { + CMP_QDIR = $$upper($$QTDIR) + CMP_INSTALL_PREFIX = $$upper($$[QT_INSTALL_PREFIX]) + } else { + CMP_QDIR = $$QTDIR + CMP_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] } + contains(CMP_QDIR, $$CMP_INSTALL_PREFIX):QTFWD = -qtdir $$QTDIR -module-fwd $$QTDIR/mkspecs/modules -developer-build + unset(CMP_QDIR) + unset(CMP_INSTALL_PREFIX) } qtPrepareTool(QMAKE_SYNCQT, syncqt) -- cgit v1.2.3