diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-18 23:00:13 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-18 23:00:13 (GMT) |
commit | 8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5 (patch) | |
tree | a95fbee6c5efc127f1c069804f7d1d1d36c2d06a | |
parent | ab9d11946e5ff88008e8c2d887b8d0458ab9a98c (diff) | |
parent | f6fd0ec480170713044d39d6ee0ebcf0a6435042 (diff) | |
download | Qt-8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5.zip Qt-8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5.tar.gz Qt-8bea6ea27ff47ff2a02cb6e8ef5b16b3a7d0f0d5.tar.bz2 |
Merge branch '4.7-upstream' into 4.7-water
-rw-r--r-- | src/network/bearer/qnetworksession.cpp | 3 | ||||
-rw-r--r-- | tools/configure/configureapp.cpp | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/network/bearer/qnetworksession.cpp b/src/network/bearer/qnetworksession.cpp index 226c3c5..db1a37c 100644 --- a/src/network/bearer/qnetworksession.cpp +++ b/src/network/bearer/qnetworksession.cpp @@ -310,8 +310,9 @@ bool QNetworkSession::waitForOpened(int msecs) if (d->isOpen) return true; - if (d->state != Connecting) + if (!(d->state == Connecting || d->state == Connected)) { return false; + } QEventLoop* loop = new QEventLoop(this); QObject::connect(d, SIGNAL(quitPendingWaitsForOpened()), diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index c967dad..915a56d 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3267,8 +3267,14 @@ void Configure::generateConfigfiles() if (qmakeConfFile.open(QFile::WriteOnly | QFile::Text)) { QTextStream qmakeConfStream; qmakeConfStream.setDevice(&qmakeConfFile); + // While QMAKESPEC_ORIGINAL being relative or absolute doesn't matter for the + // primary use of this variable by qmake to identify the original mkspec, the + // variable is also used for few special cases where the absolute path is required. + // Conversely, the include of the original qmake.conf must be done using relative path, + // as some Qt binary deployments are done in a manner that doesn't allow for patching + // the paths at the installation time. qmakeConfStream << "QMAKESPEC_ORIGINAL=" << pltSpec << endl << endl; - qmakeConfStream << "include(" << pltSpec << "/qmake.conf)" << endl; + qmakeConfStream << "include(" << "../" << spec << "/qmake.conf)" << endl << endl; qmakeConfStream.flush(); qmakeConfFile.close(); } |