diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 18:30:29 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-04-02 18:30:29 (GMT) |
| commit | 86723ca856dbd07bc7809ed9c3f9a219a99e67bd (patch) | |
| tree | 5d6e8bb3c868283b35194a16387d9677ef5ee82e /mkspecs/features | |
| parent | 00f2031c60bc472544b509586ee31c643ab2e81d (diff) | |
| parent | 87a711f1b32b737231c87a4b0cde986582ef8af5 (diff) | |
| download | Qt-86723ca856dbd07bc7809ed9c3f9a219a99e67bd.zip Qt-86723ca856dbd07bc7809ed9c3f9a219a99e67bd.tar.gz Qt-86723ca856dbd07bc7809ed9c3f9a219a99e67bd.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/moc.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index d3ad4b2..f1dcf37 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -63,7 +63,7 @@ INCREDIBUILD_XGE += moc_source #make sure we can include these files moc_dir_short = $$MOC_DIR win32:moc_dir_short ~= s,^.:,/, -contains(moc_dir_short, ^[/\\].*):INCLUDEPATH += $$MOC_DIR +contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR #auto depend on moc diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index f03d623..c7b1686 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -36,7 +36,7 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ ui_dir_short = $$UI_HEADERS_DIR win32:ui_dir_short ~= s,^.:,/, -contains(ui_dir_short, ^[/\\].*):INCLUDEPATH += $$UI_HEADERS_DIR +contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR uic3 { |