diff options
| author | Timothy Pearson <[email protected]> | 2012-07-28 15:50:52 -0500 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2012-08-04 14:53:35 +0200 |
| commit | 5ae82a06c308960c66757b0a956500b05b83f002 (patch) | |
| tree | e73bef929c230d306f377880042ce09894812ccd /src/tools | |
| parent | e9fed234b762ffe73037d70bf29ce90ea7ab8d37 (diff) | |
| download | qt3-5ae82a06c308960c66757b0a956500b05b83f002.tar.gz qt3-5ae82a06c308960c66757b0a956500b05b83f002.zip | |
Fix build warningsv3.5.13.1
Thanks to Bruce Sass for the patch!
(cherry picked from commit ebcb1d80bf517aceb69778e1e9f67e5f4da8c484)
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/qdatetime.cpp | 2 | ||||
| -rw-r--r-- | src/tools/qsettings.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/qdatetime.cpp b/src/tools/qdatetime.cpp index d0c21dc..abf2dcd 100644 --- a/src/tools/qdatetime.cpp +++ b/src/tools/qdatetime.cpp @@ -1178,7 +1178,7 @@ bool QDate::isValid( int y, int m, int d ) bool QDate::leapYear( int y ) { - return y % 4 == 0 && y % 100 != 0 || y % 400 == 0; + return (y % 4 == 0 && y % 100 != 0) || y % 400 == 0; } /*! diff --git a/src/tools/qsettings.cpp b/src/tools/qsettings.cpp index 006deb7..1ce2675 100644 --- a/src/tools/qsettings.cpp +++ b/src/tools/qsettings.cpp @@ -1051,7 +1051,7 @@ bool QSettings::sync() if ( success ) { QDir dir( QFileInfo( file ).dir( TRUE ) ); - if ( dir.exists( filename ) && !dir.remove( filename ) || + if ( ( dir.exists( filename ) && !dir.remove( filename ) ) || !dir.rename( file.name(), filename, TRUE ) ) { #ifdef QT_CHECK_STATE |