sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix some more merge confglicts after merging updates from 1.7 brnach

Browse Source
This commit is contained in:
Tim Sutton 2011-09-25 00:32:43 +02:00
parent 08d8ea2d85
commit 93a190a382
4 changed files with 2489 additions and 1480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1977
CHANGELOG
View File

File diff suppressed because it is too large Load Diff

1977
ChangeLog
View File

File diff suppressed because it is too large Load Diff

2
doc/CMakeLists.txt
View File

@ -20,7 +20,7 @@ ELSE(TXT2TAGS_EXECUTABLE)
)
ENDIF(TXT2TAGS_EXECUTABLE)
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html changelog.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS
SET(QGIS_DOC_FILES ${QGIS_DOC_FILES} index.html changelog.html favicon.ico style.css AUTHORS CONTRIBUTORS SPONSORS DONORS TRANSLATORS )
INSTALL(FILES ${QGIS_DOC_FILES} DESTINATION ${QGIS_DATA_DIR}/doc)
INSTALL(FILES images/qgis_new_80pct.png DESTINATION ${QGIS_DATA_DIR}/doc/images)

13
src/app/qgisapp.cpp
View File

@ -4590,25 +4590,12 @@ void QgisApp::checkQgisVersion()
QApplication::setOverrideCursor( Qt::WaitCursor );
QNetworkReply *reply = QgsNetworkAccessManager::instance()->get( QNetworkRequest( QUrl( "http://qgis.org/version.txt" ) ) );
op.get(); */
connect( reply, SIGNAL( finished() ), this, SLOT( versionReplyFinished() ) );
mSocket = new QTcpSocket( this );
connect( mSocket, SIGNAL( connected() ), SLOT( socketConnected() ) );
connect( mSocket, SIGNAL( connectionClosed() ), SLOT( socketConnectionClosed() ) );
connect( mSocket, SIGNAL( readyRead() ), SLOT( socketReadyRead() ) );
connect( mSocket, SIGNAL( error( QAbstractSocket::SocketError ) ),
SLOT( socketError( QAbstractSocket::SocketError ) ) );
mSocket->connectToHost( "qgis.org", 80 );
}
void QgisApp::versionReplyFinished()
{
QApplication::restoreOverrideCursor();
QTextStream os( mSocket );
mVersionMessage = "";
// send the qgis version string
// os << QGIS_VERSION << "\r\n";
os << "GET /version.txt HTTP/1.0\n\n";
QNetworkReply *reply = qobject_cast<QNetworkReply*>( sender() );
if ( !reply )