← Back to branch summary

~ubuntu-branches/ubuntu/maverick/qt4-x11/maverick-security

« back to all changes in this revision

Viewing changes to src/corelib/io/qfsfileengine_unix.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-07-06 02:43:04 UTC
  • mfrom: (1.1.32 upstream)
  • Revision ID: james.westby@ubuntu.com-20100706024304-xnrnlzeq0r5nggnb
Tags: 4:4.7.0~beta1+git20100706-0ubuntu1
* New upstream snapshot
  - Refresh kubuntu patches
  - libqt4-help replaces qt4-dev-tools (<< 4:4.7.0~beta1+git20100706)
  - qt4-designer replaces qt4-dev-tools (<< 4:4.7.0~beta1+git20100706)
  - Disable kubuntu_08_add_missing_bold_style.diff
  - Disable kubuntu_09_use_ft_glyph_embolden_to_fake_bold.diff
  - New packages:
    - qt4-qmlviewer, which replaces qt4-dev-tools
    - libqt4-declarative-{particles, gestures, folderlistmodel} which
      replaces libqt4-declarative (<< 4:4.7.0~beta1+git20100706)
* Merge with Debian git (unreleased) remaining changes:
  - Do not package firebird and ibase packages, remove from debian/rules and
    debian/control
  - libqt4-sql-ibase not recommend for libqt4-sql
  - libqtgui4: suggest, not recommend, qt4-qtconfig
  - Build with -no-phonon
  - Do not package libqt4-phonon
  - Do not add libpulse-dev to build-depends
  - Do not package libqt4-webkit transitional package
  - Build with -multimedia for now
    - Keep libqt4-multimedia package in debian/control
    - Keep libqt4-multimedia.{install, symbols, lintian-overrides}
  - libqt4-dev recommends libqt4-webkit
  - Build packages with lzma compression with override_dh_builddeb
  - Rules to remove po dir in clean
  - Add MessagesQt.sh
  - Rules to create Messages.sh link to MessagesQt.sh and rules to create po
    dir and exectue extract-messages.sh in common-install-prehook-impl
  - Rules to remove Messages.sh link
  - Make libqt4-dev depend on libx11-dev
  - In debian/rules Set DEB_HOST_ARCH and
    DEB_HOST_ARCH_OS. Configure with "-arch armv6" option on ARM
  - Add Kubuntu patches:
    - kubuntu_08_add_missing_bold_style.diff
    - kubuntu_09_use_ft_glyph_embolden_to_fake_bold.diff
    - kubuntu_10_ibus_input_method.diff
    - kubuntu_12_fix_stack_protector.diff
    - kubuntu_14_qtdemos_compile_failure.diff
    - kubuntu_15_appmenu.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/corelib/io/qfsfileengine_unix.cpp
634
634
QString QFSFileEngine::rootPath()
635
635
{
636
636
#if defined(Q_OS_SYMBIAN)
637
 
# ifdef Q_WS_S60
638
637
    TFileName symbianPath = PathInfo::PhoneMemoryRootPath();
639
638
    return QDir::cleanPath(QDir::fromNativeSeparators(qt_TDesC2QString(symbianPath)));
640
 
# else
641
 
# warning No fallback implementation of QFSFileEngine::rootPath()
642
 
    return QString();
643
 
# endif
644
639
#else
645
640
    return QLatin1String("/");
646
641
#endif
649
644
QString QFSFileEngine::tempPath()
650
645
{
651
646
#if defined(Q_OS_SYMBIAN)
652
 
# ifdef Q_WS_S60
653
647
    TFileName symbianPath = PathInfo::PhoneMemoryRootPath();
654
648
    QString temp = QDir::fromNativeSeparators(qt_TDesC2QString(symbianPath));
655
649
    temp += QLatin1String( "temp/");
656
650
 
657
651
    // Just to verify that folder really exist on hardware
658
652
    QT_MKDIR(QFile::encodeName(temp), 0777);
659
 
# else
660
 
# warning No fallback implementation of QFSFileEngine::tempPath()
661
 
    QString temp;
662
 
# endif
663
653
#else
664
654
    QString temp = QFile::decodeName(qgetenv("TMPDIR"));
665
655
    if (temp.isEmpty())