[QGIS Commit] [qgis/Quantum-GIS] 1e2e9c: Add QgsComposerMultiFrame as base class for multi-...
GitHub
noreply at github.com
Wed Aug 8 10:04:01 PDT 2012
Branch: refs/heads/master
Home: https://github.com/qgis/Quantum-GIS
Commit: 1e2e9c4d6e075b092905b5e939625bf55b130090
https://github.com/qgis/Quantum-GIS/commit/1e2e9c4d6e075b092905b5e939625bf55b130090
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M src/core/CMakeLists.txt
A src/core/composer/qgscomposermultiframe.cpp
A src/core/composer/qgscomposermultiframe.h
Log Message:
-----------
Add QgsComposerMultiFrame as base class for multi-frame composer content
Commit: 682d8b34b6d3afa48d1c223d5b25a4f53fd76975
https://github.com/qgis/Quantum-GIS/commit/682d8b34b6d3afa48d1c223d5b25a4f53fd76975
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M src/core/CMakeLists.txt
A src/core/composer/qgscomposerhtml.cpp
A src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
Log Message:
-----------
Add composer html class
Commit: 4f52d9fbd678cbbd741d3478f93bb12629cb8616
https://github.com/qgis/Quantum-GIS/commit/4f52d9fbd678cbbd741d3478f93bb12629cb8616
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-24 (Tue, 24 Jul 2012)
Changed paths:
M src/core/CMakeLists.txt
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.h
Log Message:
-----------
Add QWebPage to composer html, link core to webkit
Commit: 5135fe872a8b7c0744f9c2c868d2286cee75ad90
https://github.com/qgis/Quantum-GIS/commit/5135fe872a8b7c0744f9c2c868d2286cee75ad90
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M src/core/composer/qgscomposerhtml.cpp
Log Message:
-----------
Render method for composer html
Commit: d413a20174360796f2256de416271eb714190499
https://github.com/qgis/Quantum-GIS/commit/d413a20174360796f2256de416271eb714190499
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M src/core/CMakeLists.txt
A src/core/composer/qgscomposerframe.cpp
A src/core/composer/qgscomposerframe.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
Log Message:
-----------
Add composer frame class
Commit: b3b9674c293ca4dc28b8e835a4a6a21791096e75
https://github.com/qgis/Quantum-GIS/commit/b3b9674c293ca4dc28b8e835a4a6a21791096e75
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M src/core/composer/qgscomposeritem.cpp
M src/core/composer/qgscomposeritem.h
Log Message:
-----------
Add sizeChanged signal for composer item
Commit: c01edd4e252059a95c4723df8ddb19ecd8acfbbb
https://github.com/qgis/Quantum-GIS/commit/c01edd4e252059a95c4723df8ddb19ecd8acfbbb
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
M src/core/composer/qgscomposerframe.cpp
M src/core/composer/qgscomposerframe.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/gui/qgscomposerview.cpp
M src/gui/qgscomposerview.h
M src/ui/qgscomposerbase.ui
Log Message:
-----------
Scaling for html multi frame
Commit: 0ed3d4772c1bd1f52da3752665c70739a2481eba
https://github.com/qgis/Quantum-GIS/commit/0ed3d4772c1bd1f52da3752665c70739a2481eba
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
Log Message:
-----------
Recalculate content if one of the frames changes size
Commit: a928d57be54ceda6f2d4f14ad25a2d1541bf8632
https://github.com/qgis/Quantum-GIS/commit/a928d57be54ceda6f2d4f14ad25a2d1541bf8632
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-25 (Wed, 25 Jul 2012)
Changed paths:
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
Log Message:
-----------
Test multiple frame html rendering
Commit: b9d2615e7ca32084a2e097ca80d16e89bc00167b
https://github.com/qgis/Quantum-GIS/commit/b9d2615e7ca32084a2e097ca80d16e89bc00167b
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
Log Message:
-----------
Extend content to next pages if resize mode is extend
Commit: 590929dfac2a93024d8d039d365e7713d9ddee26
https://github.com/qgis/Quantum-GIS/commit/590929dfac2a93024d8d039d365e7713d9ddee26
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
Log Message:
-----------
Add signal / slot for adding composer html
Commit: 6f14d2c089481696f217ec7be79b9c9c7933735f
https://github.com/qgis/Quantum-GIS/commit/6f14d2c089481696f217ec7be79b9c9c7933735f
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-26 (Thu, 26 Jul 2012)
Changed paths:
M src/app/CMakeLists.txt
M src/app/composer/qgscomposer.cpp
A src/app/composer/qgscomposerhtmlwidget.cpp
A src/app/composer/qgscomposerhtmlwidget.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposition.cpp
M src/gui/qgscomposerview.cpp
A src/ui/qgscomposerhtmlwidgetbase.ui
Log Message:
-----------
Connect signal slots for html dialog
Commit: 70fe6cf72317871ea30947287e6b3b402c00bbb1
https://github.com/qgis/Quantum-GIS/commit/70fe6cf72317871ea30947287e6b3b402c00bbb1
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
M src/app/composer/qgscomposerhtmlwidget.cpp
M src/app/composer/qgscomposerhtmlwidget.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
M src/gui/qgscomposerview.cpp
Log Message:
-----------
Delete composer frames from list
Commit: 050c0ff63d9b92f627a8fff4ca7e8d27cefe6ffe
https://github.com/qgis/Quantum-GIS/commit/050c0ff63d9b92f627a8fff4ca7e8d27cefe6ffe
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M src/app/composer/qgscomposerhtmlwidget.cpp
M src/core/composer/qgscomposerhtml.cpp
Log Message:
-----------
Fix update of html frames
Commit: d57ecae57b9f1cdda47a7771cf09cca468e9aa75
https://github.com/qgis/Quantum-GIS/commit/d57ecae57b9f1cdda47a7771cf09cca468e9aa75
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-27 (Fri, 27 Jul 2012)
Changed paths:
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
Log Message:
-----------
Remove multi frame once the last frame is deleted
Commit: 0e5e3679391bf33f14e3622cc403ac030a270002
https://github.com/qgis/Quantum-GIS/commit/0e5e3679391bf33f14e3622cc403ac030a270002
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M src/app/composer/qgscomposer.cpp
M src/core/composer/qgscomposerframe.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposeritem.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposition.cpp
Log Message:
-----------
Save html multiframe
Commit: 2e6ecbc3536e725c6640b1878c78d4c87f8c7c1d
https://github.com/qgis/Quantum-GIS/commit/2e6ecbc3536e725c6640b1878c78d4c87f8c7c1d
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M src/core/composer/qgscomposerframe.cpp
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposition.cpp
Log Message:
-----------
Load / save html item and multi frames
Commit: eb0841480e3027d25cdb7b8f3e113e6b2b5ac12e
https://github.com/qgis/Quantum-GIS/commit/eb0841480e3027d25cdb7b8f3e113e6b2b5ac12e
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-30 (Mon, 30 Jul 2012)
Changed paths:
M src/app/composer/qgscomposerhtmlwidget.cpp
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/gui/qgscomposerview.cpp
Log Message:
-----------
Update frame widgets if the multiframe object has changed
Commit: ec0a02b788b78eb91169b113bb7dafeaf8509b7f
https://github.com/qgis/Quantum-GIS/commit/ec0a02b788b78eb91169b113bb7dafeaf8509b7f
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-07-31 (Tue, 31 Jul 2012)
Changed paths:
M src/core/CMakeLists.txt
A src/core/composer/qgsaddremovemultiframecommand.cpp
A src/core/composer/qgsaddremovemultiframecommand.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
M src/gui/qgscomposerview.cpp
Log Message:
-----------
Add/Remove command for composer multipage
Commit: 3ebef1b66db8d97a2481194b7f829daa07849e0c
https://github.com/qgis/Quantum-GIS/commit/3ebef1b66db8d97a2481194b7f829daa07849e0c
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-02 (Thu, 02 Aug 2012)
Changed paths:
M src/core/composer/qgscomposerframe.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposition.cpp
M src/gui/qgscomposerview.cpp
Log Message:
-----------
Improved multiframe command handling
Commit: d703289b839e19b048770ad259eab6d1c7f032e9
https://github.com/qgis/Quantum-GIS/commit/d703289b839e19b048770ad259eab6d1c7f032e9
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-03 (Fri, 03 Aug 2012)
Changed paths:
M src/app/composer/qgscomposerhtmlwidget.cpp
M src/core/CMakeLists.txt
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
A src/core/composer/qgscomposermultiframecommand.cpp
A src/core/composer/qgscomposermultiframecommand.h
Log Message:
-----------
Add command class for multiframe changes
Commit: 7e97033a19b388e25e1775a47bf6fa48865e9d81
https://github.com/qgis/Quantum-GIS/commit/7e97033a19b388e25e1775a47bf6fa48865e9d81
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M src/core/composer/qgscomposermultiframe.cpp
Log Message:
-----------
Fix positioning of new frames
Commit: a003f743a930c52cca4605fb906bbd5185ab2af8
https://github.com/qgis/Quantum-GIS/commit/a003f743a930c52cca4605fb906bbd5185ab2af8
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M src/core/composer/qgscomposerhtml.cpp
Log Message:
-----------
Webkit seems to assume a standard dpi of 96
Commit: 8719ef938cd93824dbecf718c9c074fdba034465
https://github.com/qgis/Quantum-GIS/commit/8719ef938cd93824dbecf718c9c074fdba034465
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M images/images.qrc
A images/themes/default/mActionAddHtml.png
M src/app/composer/qgscomposer.cpp
Log Message:
-----------
Add html icon to composer
Commit: 95e7832148a19af26bad75d45cfaccaa1377ec05
https://github.com/qgis/Quantum-GIS/commit/95e7832148a19af26bad75d45cfaccaa1377ec05
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M tests/src/core/CMakeLists.txt
M tests/src/core/qgscompositionchecker.cpp
A tests/src/core/testqgscomposerhtml.cpp
A tests/testdata/control_images/expected_composerhtml/composerhtml_table.png
A tests/testdata/html_table.html
Log Message:
-----------
Add composer html test
Commit: 02d05d1930db5c84730c87ce30d067087bd1d41b
https://github.com/qgis/Quantum-GIS/commit/02d05d1930db5c84730c87ce30d067087bd1d41b
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M src/core/composer/qgscomposermultiframe.cpp
M tests/src/core/qgscompositionchecker.cpp
M tests/src/core/testqgscomposerhtml.cpp
A tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png
A tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png
A tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png
Log Message:
-----------
Test for multiframe html item
Commit: b2782c06ef665e9d16c4e672bdc99972bf53665d
https://github.com/qgis/Quantum-GIS/commit/b2782c06ef665e9d16c4e672bdc99972bf53665d
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-07 (Tue, 07 Aug 2012)
Changed paths:
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposermultiframecommand.cpp
M src/gui/qgscomposerview.cpp
M tests/src/core/testqgscomposerhtml.cpp
Log Message:
-----------
Avoid undo commands from multiframe classes
Commit: b40d0af2e6e71b6c73d3978dc0bc5584d03c8305
https://github.com/qgis/Quantum-GIS/commit/b40d0af2e6e71b6c73d3978dc0bc5584d03c8305
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M src/core/composer/qgscomposerframe.cpp
M src/core/composer/qgscomposerframe.h
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposeritem.cpp
M src/core/composer/qgscomposeritem.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposermultiframecommand.cpp
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
M src/gui/qgscomposerview.cpp
M tests/src/core/testqgscomposerhtml.cpp
Log Message:
-----------
Further changes to undo-mechanism. Currently not working
Commit: c2f768fa9313f327bca1c071e7aa64e12f1b0321
https://github.com/qgis/Quantum-GIS/commit/c2f768fa9313f327bca1c071e7aa64e12f1b0321
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M src/core/composer/qgscomposerframe.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframecommand.cpp
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
Log Message:
-----------
More multiframe undo improvements
Commit: 4969d6760f21d133cb99a929ad58d56cacd4ab24
https://github.com/qgis/Quantum-GIS/commit/4969d6760f21d133cb99a929ad58d56cacd4ab24
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M src/app/composer/qgscomposerhtmlwidget.cpp
Log Message:
-----------
More undo/redo improvements
Commit: 9a3d6abd02419b76bd59d3120626ea99d29db391
https://github.com/qgis/Quantum-GIS/commit/9a3d6abd02419b76bd59d3120626ea99d29db391
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M src/core/composer/qgscomposerhtml.cpp
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposition.cpp
M src/gui/qgscomposerview.cpp
M tests/src/core/testqgscomposerhtml.cpp
Log Message:
-----------
Move adding the first html frame out of QgsComposerHtml
Commit: ce84b5608e3cff4cfea22f336773d93e573ea4b8
https://github.com/qgis/Quantum-GIS/commit/ce84b5608e3cff4cfea22f336773d93e573ea4b8
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M src/core/composer/qgscomposition.cpp
M tests/src/core/testqgscomposerhtml.cpp
Log Message:
-----------
Avoid crash in html item test
Commit: 852c5e78c28eb8dc3541e389e5fdbbaeeccac5d7
https://github.com/qgis/Quantum-GIS/commit/852c5e78c28eb8dc3541e389e5fdbbaeeccac5d7
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M src/core/composer/qgscomposermultiframe.cpp
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
M tests/src/core/testqgscomposerhtml.cpp
Log Message:
-----------
More cleanup changes
Commit: 12f521eb559e10e4491e999fc2255e6892eb526a
https://github.com/qgis/Quantum-GIS/commit/12f521eb559e10e4491e999fc2255e6892eb526a
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M tests/src/core/qgscompositionchecker.cpp
M tests/src/core/testqgscomposerhtml.cpp
Log Message:
-----------
Fix html test
Commit: e6d988057fbea22ab3b7ac1a15893700c9799b5b
https://github.com/qgis/Quantum-GIS/commit/e6d988057fbea22ab3b7ac1a15893700c9799b5b
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M images/images.qrc
A images/themes/default/mActionAddHtml.png
M src/app/CMakeLists.txt
M src/app/composer/qgscomposer.cpp
M src/app/composer/qgscomposer.h
A src/app/composer/qgscomposerhtmlwidget.cpp
A src/app/composer/qgscomposerhtmlwidget.h
M src/core/CMakeLists.txt
A src/core/composer/qgsaddremovemultiframecommand.cpp
A src/core/composer/qgsaddremovemultiframecommand.h
A src/core/composer/qgscomposerframe.cpp
A src/core/composer/qgscomposerframe.h
A src/core/composer/qgscomposerhtml.cpp
A src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposeritem.cpp
M src/core/composer/qgscomposeritem.h
A src/core/composer/qgscomposermultiframe.cpp
A src/core/composer/qgscomposermultiframe.h
A src/core/composer/qgscomposermultiframecommand.cpp
A src/core/composer/qgscomposermultiframecommand.h
M src/core/composer/qgscomposition.cpp
M src/core/composer/qgscomposition.h
M src/gui/qgscomposerview.cpp
M src/gui/qgscomposerview.h
M src/ui/qgscomposerbase.ui
A src/ui/qgscomposerhtmlwidgetbase.ui
M tests/src/core/CMakeLists.txt
M tests/src/core/qgscompositionchecker.cpp
A tests/src/core/testqgscomposerhtml.cpp
A tests/testdata/control_images/expected_composerhtml/composerhtml_table.png
A tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe1.png
A tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe2.png
A tests/testdata/control_images/expected_composerhtml/composerhtml_table_multiframe3.png
A tests/testdata/html_table.html
Log Message:
-----------
Fix merge conflict
Commit: e5527071ab8686b7b8341325805346b931481357
https://github.com/qgis/Quantum-GIS/commit/e5527071ab8686b7b8341325805346b931481357
Author: Marco Hugentobler <marco.hugentobler at sourcepole.ch>
Date: 2012-08-08 (Wed, 08 Aug 2012)
Changed paths:
M src/core/composer/qgscomposerframe.cpp
M src/core/composer/qgscomposerframe.h
M src/core/composer/qgscomposerhtml.h
M src/core/composer/qgscomposermultiframe.h
M src/core/composer/qgscomposermultiframecommand.h
Log Message:
-----------
Add export macros to classes and fix warning
Compare: https://github.com/qgis/Quantum-GIS/compare/954bec45a0be...e5527071ab86
More information about the QGIS-commit
mailing list