diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 10:32:20 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-08 10:32:20 (GMT) |
| commit | 63af499ed900b9aa8f4aff7253f4a9d1002dacda (patch) | |
| tree | 524441b90341e6870fb624e4dec135a70b7f5008 /src/3rdparty | |
| parent | 75c5bc5f7efd5f7055b689a244147e69733280a4 (diff) | |
| parent | b57afadf3f91f87eba02458faa2809dd07b45da5 (diff) | |
| download | Qt-63af499ed900b9aa8f4aff7253f4a9d1002dacda.zip Qt-63af499ed900b9aa8f4aff7253f4a9d1002dacda.tar.gz Qt-63af499ed900b9aa8f4aff7253f4a9d1002dacda.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits)
fix build with sqlite2
respect UI_DIR when creating image collections
Doc: more cleaning
Doc: fixing escape character
Doc: cleaning html generator
Doc: changing index page
Doc: fixing link to devnet
Doc: adding HTML class names and style docs to the generator
Doc: Fixing typo - background file name
doc: Added doc for accessing views and models from delegates.
Doc: Fixing broken link
Doc: fixing typo
Doc: fixing typos
qdoc: Fixed table of contents for namespace pages.
SSL backend: load libraries for certificates only once
immediately set function context when entering a namespace
Phonon MediaSource fails to load when passed as a resource file
Set QT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH to default value
qdoc: Fixed a few links to QtObject (QML:QtObject)
Simplify *= to += after contains() test
...
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/phonon/mediasource.cpp | 2 | ||||
| -rw-r--r-- | src/3rdparty/sqlite.pri | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/phonon/mediasource.cpp b/src/3rdparty/phonon/phonon/mediasource.cpp index be22dc3..11d2428 100644 --- a/src/3rdparty/phonon/phonon/mediasource.cpp +++ b/src/3rdparty/phonon/phonon/mediasource.cpp @@ -50,7 +50,7 @@ MediaSource::MediaSource(const QString &filename) const QFileInfo fileInfo(filename); if (fileInfo.exists()) { bool localFs = QAbstractFileEngine::LocalDiskFlag & QFSFileEngine(filename).fileFlags(QAbstractFileEngine::LocalDiskFlag); - if (localFs) { + if (localFs && !filename.startsWith(QLatin1String(":/")) && !filename.startsWith(QLatin1String("qrc://"))) { d->url = QUrl::fromLocalFile(fileInfo.absoluteFilePath()); } else { #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri new file mode 100644 index 0000000..575412d --- /dev/null +++ b/src/3rdparty/sqlite.pri @@ -0,0 +1,4 @@ +CONFIG(release, debug|release):DEFINES *= NDEBUG +DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE +INCLUDEPATH += $$PWD/sqlite +SOURCES += $$PWD/sqlite/sqlite3.c |