AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6

Browse Source
This commit is contained in:
Liang Qi 2016-01-29 11:00:42 +00:00 committed by The Qt Project
commit 270cc073b7
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/unix/compile.test
View File

@ -67,7 +67,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1
# Make sure output from possible previous tests is gone # Make sure output from possible previous tests is gone
rm -f "$EXE" "${EXE}.exe" rm -f "$EXE" "${EXE}.exe"
set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" set -- "$OUTDIR/bin/qmake" -nocache -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG+=android_app" "CONFIG-=debug_and_release app_bundle lib_bundle" "LIBS+=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile"
if [ "$VERBOSE" = "yes" ]; then if [ "$VERBOSE" = "yes" ]; then
OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes OUTDIR=$OUTDIR "$@" && $MAKE && SUCCESS=yes
else else

3
src/corelib/thread/qfutureinterface.cpp
View File

@ -193,16 +193,19 @@ void QFutureInterfaceBase::waitForResume()
int QFutureInterfaceBase::progressValue() const int QFutureInterfaceBase::progressValue() const
{ {
const QMutexLocker lock(&d->m_mutex);
return d->m_progressValue; return d->m_progressValue;
} }
int QFutureInterfaceBase::progressMinimum() const int QFutureInterfaceBase::progressMinimum() const
{ {
const QMutexLocker lock(&d->m_mutex);
return d->m_progressMinimum; return d->m_progressMinimum;
} }
int QFutureInterfaceBase::progressMaximum() const int QFutureInterfaceBase::progressMaximum() const
{ {
const QMutexLocker lock(&d->m_mutex);
return d->m_progressMaximum; return d->m_progressMaximum;
} }

10
src/corelib/thread/qfutureinterface_p.h
View File

@ -146,18 +146,20 @@ public:
QAtomicInt m_refCountT; QAtomicInt m_refCountT;
}; };
// T: accessed from executing thread
// Q: accessed from the waiting/querying thread
RefCount refCount; RefCount refCount;
mutable QMutex m_mutex; mutable QMutex m_mutex;
QWaitCondition waitCondition; QWaitCondition waitCondition;
QList<QFutureCallOutInterface *> outputConnections; QList<QFutureCallOutInterface *> outputConnections;
int m_progressValue; int m_progressValue; // TQ
int m_progressMinimum; int m_progressMinimum; // TQ
int m_progressMaximum; int m_progressMaximum; // TQ
QFutureInterfaceBase::State state; QFutureInterfaceBase::State state;
QElapsedTimer progressTime; QElapsedTimer progressTime;
QWaitCondition pausedWaitCondition; QWaitCondition pausedWaitCondition;
QtPrivate::ResultStoreBase m_results; QtPrivate::ResultStoreBase m_results;
bool manualProgress; bool manualProgress; // only accessed from executing thread
int m_expectedResultCount; int m_expectedResultCount;
QtPrivate::ExceptionStore m_exceptionStore; QtPrivate::ExceptionStore m_exceptionStore;
QString m_progressText; QString m_progressText;

9
tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
View File

@ -146,6 +146,7 @@ private slots:
void mysql_multiselect(); // For task 144331 void mysql_multiselect(); // For task 144331
void mysql_savepointtest_data() { generic_data("QMYSQL"); } void mysql_savepointtest_data() { generic_data("QMYSQL"); }
void mysql_savepointtest(); void mysql_savepointtest();
void mysql_connectWithInvalidAddress();
void accessOdbc_strings_data() { generic_data(); } void accessOdbc_strings_data() { generic_data(); }
void accessOdbc_strings(); void accessOdbc_strings();
@ -2192,6 +2193,14 @@ void tst_QSqlDatabase::mysql_savepointtest()
QVERIFY_SQL(q, exec("savepoint foo")); QVERIFY_SQL(q, exec("savepoint foo"));
} }
void tst_QSqlDatabase::mysql_connectWithInvalidAddress()
{
// Ensure that giving invalid connection parameters fails correctly
QSqlDatabase db = QSqlDatabase::addDatabase("QMYSQL");
db.setHostName("invalid.local");
QCOMPARE(db.open(), false);
}
void tst_QSqlDatabase::oci_tables() void tst_QSqlDatabase::oci_tables()
{ {
QSKIP("Requires specific permissions to create a system table"); QSKIP("Requires specific permissions to create a system table");