summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2014-02-10 19:54:25 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-11 14:50:21 (GMT)
commit11100f235e8121af75b15a6946d66ec9a577c779 (patch)
tree2ec15fee3bdc4a4c56e87b779f2f8034a09befec
parent95f256d21dd4e7683a1476a572d121a30fb929ba (diff)
downloadQt-11100f235e8121af75b15a6946d66ec9a577c779.zip
Qt-11100f235e8121af75b15a6946d66ec9a577c779.tar.gz
Qt-11100f235e8121af75b15a6946d66ec9a577c779.tar.bz2
Fix the Carbon build
The function does not exist when building for Carbon with the 10.5 SDK so since this means the function will effectively do nothing, so we just return false in this case. Change-Id: If41762a055ebeccfcfce751e164b6a6e7e1db437 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-rw-r--r--src/gui/dialogs/qfiledialog_mac.mm6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/gui/dialogs/qfiledialog_mac.mm b/src/gui/dialogs/qfiledialog_mac.mm
index 15a2e70..8fea8b1 100644
--- a/src/gui/dialogs/qfiledialog_mac.mm
+++ b/src/gui/dialogs/qfiledialog_mac.mm
@@ -293,6 +293,7 @@ QT_USE_NAMESPACE
- (BOOL)isHiddenFile:(NSString *)filename isDir:(BOOL)isDir
{
+#ifdef QT_MAC_USE_COCOA
CFURLRef url = CFURLCreateWithFileSystemPath(kCFAllocatorDefault, (CFStringRef)filename, kCFURLPOSIXPathStyle, isDir);
CFBooleanRef isHidden;
Boolean errorOrHidden = false;
@@ -305,6 +306,11 @@ QT_USE_NAMESPACE
}
CFRelease(url);
return errorOrHidden;
+#else
+ Q_UNUSED(filename);
+ Q_UNUSED(isDir);
+ return false;
+#endif
}
- (BOOL)panel:(id)sender shouldShowFilename:(NSString *)filename