| qgsconfig.h | qgsconfig.h | |||
|---|---|---|---|---|
| // QGSCONFIG.H | // QGSCONFIG.H | |||
| #ifndef QGSCONFIG_H | #ifndef QGSCONFIG_H | |||
| #define QGSCONFIG_H | #define QGSCONFIG_H | |||
| // Version must be specified according to | // Version must be specified according to | |||
| // <int>.<int>.<int>-<any text>. | // <int>.<int>.<int>-<any text>. | |||
| // or else upgrading old project file will not work | // or else upgrading old project file will not work | |||
| // reliably. | // reliably. | |||
| #define VERSION "1.7.2-Wroclaw" | #define VERSION "1.7.3-Wroclaw" | |||
| //used in vim src/core/qgis.cpp | //used in vim src/core/qgis.cpp | |||
| //The way below should work but it resolves to a number like 0110 which the compiler treats as octal I think | //The way below should work but it resolves to a number like 0110 which the compiler treats as octal I think | |||
| //because debuggin it out shows the decimal number 72 which results in inco rrect version status. | //because debuggin it out shows the decimal number 72 which results in inco rrect version status. | |||
| //As a short term fix I (Tim) am defining the version in top level cmake. I t would be good to | //As a short term fix I (Tim) am defining the version in top level cmake. I t would be good to | |||
| //reinstate this more generic approach below at some point though | //reinstate this more generic approach below at some point though | |||
| //#define VERSION_INT 172 | //#define VERSION_INT 173 | |||
| #define VERSION_INT 10702 | #define VERSION_INT 10703 | |||
| //used in main.cpp and anywhere else where the release name is needed | //used in main.cpp and anywhere else where the release name is needed | |||
| #define RELEASE_NAME "Wroclaw" | #define RELEASE_NAME "Wroclaw" | |||
| #define QGIS_PLUGIN_SUBDIR "lib/qgis/plugins" | #define QGIS_PLUGIN_SUBDIR "lib/qgis/plugins" | |||
| #define QGIS_DATA_SUBDIR "share/qgis" | #define QGIS_DATA_SUBDIR "share/qgis" | |||
| #define QGIS_LIBEXEC_SUBDIR "lib/qgis" | #define QGIS_LIBEXEC_SUBDIR "lib/qgis" | |||
| #define QGIS_LIB_SUBDIR "lib" | #define QGIS_LIB_SUBDIR "lib" | |||
| #define CMAKE_INSTALL_PREFIX "/home/andrey/upstream-tracker/testing/qgis/1. 7.2" | #define CMAKE_INSTALL_PREFIX "/home/andrey/upstream-tracker/testing/qgis/1. 7.3" | |||
| #define HAVE_POSTGRESQL | #define HAVE_POSTGRESQL | |||
| #define HAVE_SPATIALITE | #define HAVE_SPATIALITE | |||
| /* #undef HAVE_PYTHON */ | /* #undef HAVE_PYTHON */ | |||
| #endif | #endif | |||
| End of changes. 3 change blocks. | ||||
| 4 lines changed or deleted | 4 lines changed or added | |||
| qgsprojectionselector.h | qgsprojectionselector.h | |||
|---|---|---|---|---|
| skipping to change at line 189 | skipping to change at line 189 | |||
| //! add recently used CRS | //! add recently used CRS | |||
| void insertRecent( long theCrsId ); | void insertRecent( long theCrsId ); | |||
| //! Has the Projection List been populated? | //! Has the Projection List been populated? | |||
| bool mProjListDone; | bool mProjListDone; | |||
| //! Has the User Projection List been populated? | //! Has the User Projection List been populated? | |||
| bool mUserProjListDone; | bool mUserProjListDone; | |||
| //! Has the Recent Projection List been populated? | ||||
| bool mRecentProjListDone; | ||||
| //! Is there a pending selection to be made by CRS Name? | //! Is there a pending selection to be made by CRS Name? | |||
| bool mCRSNameSelectionPending; | bool mCRSNameSelectionPending; | |||
| //! Is there a pending selection to be made by CRS ID? | //! Is there a pending selection to be made by CRS ID? | |||
| bool mCRSIDSelectionPending; | bool mCRSIDSelectionPending; | |||
| //! Is there a pending selection to be made by Authority ID? | //! Is there a pending selection to be made by Authority ID? | |||
| bool mAuthIDSelectionPending; | bool mAuthIDSelectionPending; | |||
| //! The CRS Name that wants to be selected on this widget | //! The CRS Name that wants to be selected on this widget | |||
| End of changes. 1 change blocks. | ||||
| 0 lines changed or deleted | 3 lines changed or added | |||
| ui_qgscredentialdialog.h | ui_qgscredentialdialog.h | |||
|---|---|---|---|---|
| /************************************************************************** ****** | /************************************************************************** ****** | |||
| ** Form generated from reading UI file 'qgscredentialdialog.ui' | ** Form generated from reading UI file 'qgscredentialdialog.ui' | |||
| ** | ** | |||
| ** Created: Fri Dec 9 19:11:22 2011 | ** Created: Sun Dec 11 06:04:09 2011 | |||
| ** by: Qt User Interface Compiler version 4.7.4 | ** by: Qt User Interface Compiler version 4.7.4 | |||
| ** | ** | |||
| ** WARNING! All changes made in this file will be lost when recompiling UI file! | ** WARNING! All changes made in this file will be lost when recompiling UI file! | |||
| *************************************************************************** *****/ | *************************************************************************** *****/ | |||
| #ifndef UI_QGSCREDENTIALDIALOG_H | #ifndef UI_QGSCREDENTIALDIALOG_H | |||
| #define UI_QGSCREDENTIALDIALOG_H | #define UI_QGSCREDENTIALDIALOG_H | |||
| #include <QtCore/QVariant> | #include <QtCore/QVariant> | |||
| #include <QtGui/QAction> | #include <QtGui/QAction> | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| ui_qgsdetaileditemwidgetbase.h | ui_qgsdetaileditemwidgetbase.h | |||
|---|---|---|---|---|
| /************************************************************************** ****** | /************************************************************************** ****** | |||
| ** Form generated from reading UI file 'qgsdetaileditemwidgetbase.ui' | ** Form generated from reading UI file 'qgsdetaileditemwidgetbase.ui' | |||
| ** | ** | |||
| ** Created: Fri Dec 9 19:11:21 2011 | ** Created: Sun Dec 11 06:04:08 2011 | |||
| ** by: Qt User Interface Compiler version 4.7.4 | ** by: Qt User Interface Compiler version 4.7.4 | |||
| ** | ** | |||
| ** WARNING! All changes made in this file will be lost when recompiling UI file! | ** WARNING! All changes made in this file will be lost when recompiling UI file! | |||
| *************************************************************************** *****/ | *************************************************************************** *****/ | |||
| #ifndef UI_QGSDETAILEDITEMWIDGETBASE_H | #ifndef UI_QGSDETAILEDITEMWIDGETBASE_H | |||
| #define UI_QGSDETAILEDITEMWIDGETBASE_H | #define UI_QGSDETAILEDITEMWIDGETBASE_H | |||
| #include <QtCore/QVariant> | #include <QtCore/QVariant> | |||
| #include <QtGui/QAction> | #include <QtGui/QAction> | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| ui_qgsgenericprojectionselectorbase.h | ui_qgsgenericprojectionselectorbase.h | |||
|---|---|---|---|---|
| /************************************************************************** ****** | /************************************************************************** ****** | |||
| ** Form generated from reading UI file 'qgsgenericprojectionselectorbase.ui ' | ** Form generated from reading UI file 'qgsgenericprojectionselectorbase.ui ' | |||
| ** | ** | |||
| ** Created: Fri Dec 9 19:11:22 2011 | ** Created: Sun Dec 11 06:04:09 2011 | |||
| ** by: Qt User Interface Compiler version 4.7.4 | ** by: Qt User Interface Compiler version 4.7.4 | |||
| ** | ** | |||
| ** WARNING! All changes made in this file will be lost when recompiling UI file! | ** WARNING! All changes made in this file will be lost when recompiling UI file! | |||
| *************************************************************************** *****/ | *************************************************************************** *****/ | |||
| #ifndef UI_QGSGENERICPROJECTIONSELECTORBASE_H | #ifndef UI_QGSGENERICPROJECTIONSELECTORBASE_H | |||
| #define UI_QGSGENERICPROJECTIONSELECTORBASE_H | #define UI_QGSGENERICPROJECTIONSELECTORBASE_H | |||
| #include <QtCore/QVariant> | #include <QtCore/QVariant> | |||
| #include <QtGui/QAction> | #include <QtGui/QAction> | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| ui_qgsmessageviewer.h | ui_qgsmessageviewer.h | |||
|---|---|---|---|---|
| /************************************************************************** ****** | /************************************************************************** ****** | |||
| ** Form generated from reading UI file 'qgsmessageviewer.ui' | ** Form generated from reading UI file 'qgsmessageviewer.ui' | |||
| ** | ** | |||
| ** Created: Fri Dec 9 19:11:21 2011 | ** Created: Sun Dec 11 06:04:08 2011 | |||
| ** by: Qt User Interface Compiler version 4.7.4 | ** by: Qt User Interface Compiler version 4.7.4 | |||
| ** | ** | |||
| ** WARNING! All changes made in this file will be lost when recompiling UI file! | ** WARNING! All changes made in this file will be lost when recompiling UI file! | |||
| *************************************************************************** *****/ | *************************************************************************** *****/ | |||
| #ifndef UI_QGSMESSAGEVIEWER_H | #ifndef UI_QGSMESSAGEVIEWER_H | |||
| #define UI_QGSMESSAGEVIEWER_H | #define UI_QGSMESSAGEVIEWER_H | |||
| #include <QtCore/QVariant> | #include <QtCore/QVariant> | |||
| #include <QtGui/QAction> | #include <QtGui/QAction> | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| ui_qgsprojectionselectorbase.h | ui_qgsprojectionselectorbase.h | |||
|---|---|---|---|---|
| /************************************************************************** ****** | /************************************************************************** ****** | |||
| ** Form generated from reading UI file 'qgsprojectionselectorbase.ui' | ** Form generated from reading UI file 'qgsprojectionselectorbase.ui' | |||
| ** | ** | |||
| ** Created: Fri Dec 9 19:11:22 2011 | ** Created: Sun Dec 11 06:04:09 2011 | |||
| ** by: Qt User Interface Compiler version 4.7.4 | ** by: Qt User Interface Compiler version 4.7.4 | |||
| ** | ** | |||
| ** WARNING! All changes made in this file will be lost when recompiling UI file! | ** WARNING! All changes made in this file will be lost when recompiling UI file! | |||
| *************************************************************************** *****/ | *************************************************************************** *****/ | |||
| #ifndef UI_QGSPROJECTIONSELECTORBASE_H | #ifndef UI_QGSPROJECTIONSELECTORBASE_H | |||
| #define UI_QGSPROJECTIONSELECTORBASE_H | #define UI_QGSPROJECTIONSELECTORBASE_H | |||
| #include <QtCore/QVariant> | #include <QtCore/QVariant> | |||
| #include <QtGui/QAction> | #include <QtGui/QAction> | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||
| ui_qgsquerybuilderbase.h | ui_qgsquerybuilderbase.h | |||
|---|---|---|---|---|
| /* | /* | |||
| Query builder for vector layers | Query builder for vector layers | |||
| */ | */ | |||
| /************************************************************************** ****** | /************************************************************************** ****** | |||
| ** Form generated from reading UI file 'qgsquerybuilderbase.ui' | ** Form generated from reading UI file 'qgsquerybuilderbase.ui' | |||
| ** | ** | |||
| ** Created: Fri Dec 9 19:11:21 2011 | ** Created: Sun Dec 11 06:04:08 2011 | |||
| ** by: Qt User Interface Compiler version 4.7.4 | ** by: Qt User Interface Compiler version 4.7.4 | |||
| ** | ** | |||
| ** WARNING! All changes made in this file will be lost when recompiling UI file! | ** WARNING! All changes made in this file will be lost when recompiling UI file! | |||
| *************************************************************************** *****/ | *************************************************************************** *****/ | |||
| #ifndef UI_QGSQUERYBUILDERBASE_H | #ifndef UI_QGSQUERYBUILDERBASE_H | |||
| #define UI_QGSQUERYBUILDERBASE_H | #define UI_QGSQUERYBUILDERBASE_H | |||
| #include <QtCore/QVariant> | #include <QtCore/QVariant> | |||
| #include <QtGui/QAction> | #include <QtGui/QAction> | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 lines changed or added | |||