Qreator

Merge lp://staging/~dpm/qreator/qreator-touch-with-plugin into lp://staging/qreator/touch

qreator-touch-with-plugin
Merge into touch

Proposed by David Planella on 2014-05-10

Status:	Merged
Merged at revision:	18
Proposed branch:	lp://staging/~dpm/qreator/qreator-touch-with-plugin
Merge into:	lp://staging/qreator/touch
Diff against target:	20868 lines (+19349/-198) 215 files modified .bzrignore (+4/-0) 3rdParty/CMakeLists.txt (+1/-0) 3rdParty/lib.pro (+2/-0) 3rdParty/zxing/BarcodeFormat.cpp (+37/-0) 3rdParty/zxing/BarcodeFormat.h (+44/-0) 3rdParty/zxing/Binarizer.cpp (+37/-0) 3rdParty/zxing/Binarizer.h (+46/-0) 3rdParty/zxing/BinaryBitmap.cpp (+67/-0) 3rdParty/zxing/BinaryBitmap.h (+57/-0) 3rdParty/zxing/CMakeLists.txt (+110/-0) 3rdParty/zxing/DecodeHints.cpp (+120/-0) 3rdParty/zxing/DecodeHints.h (+72/-0) 3rdParty/zxing/Exception.cpp (+40/-0) 3rdParty/zxing/Exception.h (+40/-0) 3rdParty/zxing/FormatException.cpp (+35/-0) 3rdParty/zxing/FormatException.h (+35/-0) 3rdParty/zxing/LuminanceSource.cpp (+80/-0) 3rdParty/zxing/LuminanceSource.h (+52/-0) 3rdParty/zxing/MultiFormatReader.cpp (+106/-0) 3rdParty/zxing/MultiFormatReader.h (+49/-0) 3rdParty/zxing/NotFoundException.cpp (+28/-0) 3rdParty/zxing/NotFoundException.h (+33/-0) 3rdParty/zxing/Reader.cpp (+31/-0) 3rdParty/zxing/Reader.h (+40/-0) 3rdParty/zxing/ReaderException.cpp (+35/-0) 3rdParty/zxing/ReaderException.h (+35/-0) 3rdParty/zxing/Result.cpp (+64/-0) 3rdParty/zxing/Result.h (+54/-0) 3rdParty/zxing/ResultPoint.cpp (+100/-0) 3rdParty/zxing/ResultPoint.h (+54/-0) 3rdParty/zxing/ResultPointCallback.cpp (+26/-0) 3rdParty/zxing/ResultPointCallback.h (+39/-0) 3rdParty/zxing/aztec/AztecDetectorResult.cpp (+45/-0) 3rdParty/zxing/aztec/AztecDetectorResult.h (+42/-0) 3rdParty/zxing/aztec/AztecReader.cpp (+64/-0) 3rdParty/zxing/aztec/AztecReader.h (+49/-0) 3rdParty/zxing/aztec/decoder/AztecDecoder.cpp (+496/-0) 3rdParty/zxing/aztec/decoder/Decoder.h (+63/-0) 3rdParty/zxing/aztec/detector/AztecDetector.cpp (+541/-0) 3rdParty/zxing/aztec/detector/Detector.h (+87/-0) 3rdParty/zxing/common/Array.cpp (+22/-0) 3rdParty/zxing/common/Array.h (+208/-0) 3rdParty/zxing/common/BitArray.cpp (+127/-0) 3rdParty/zxing/common/BitArray.h (+70/-0) 3rdParty/zxing/common/BitMatrix.cpp (+157/-0) 3rdParty/zxing/common/BitMatrix.h (+87/-0) 3rdParty/zxing/common/BitSource.cpp (+74/-0) 3rdParty/zxing/common/BitSource.h (+70/-0) 3rdParty/zxing/common/CharacterSetECI.cpp (+104/-0) 3rdParty/zxing/common/CharacterSetECI.h (+53/-0) 3rdParty/zxing/common/Counted.cpp (+32/-0) 3rdParty/zxing/common/Counted.h (+202/-0) 3rdParty/zxing/common/DecoderResult.cpp (+46/-0) 3rdParty/zxing/common/DecoderResult.h (+51/-0) 3rdParty/zxing/common/DetectorResult.cpp (+38/-0) 3rdParty/zxing/common/DetectorResult.h (+43/-0) 3rdParty/zxing/common/EdgeDetector.cpp (+191/-0) 3rdParty/zxing/common/EdgeDetector.h (+38/-0) 3rdParty/zxing/common/GlobalHistogramBinarizer.cpp (+209/-0) 3rdParty/zxing/common/GlobalHistogramBinarizer.h (+47/-0) 3rdParty/zxing/common/GreyscaleLuminanceSource.cpp (+70/-0) 3rdParty/zxing/common/GreyscaleLuminanceSource.h (+62/-0) 3rdParty/zxing/common/GreyscaleRotatedLuminanceSource.cpp (+65/-0) 3rdParty/zxing/common/GreyscaleRotatedLuminanceSource.h (+60/-0) 3rdParty/zxing/common/GridSampler.cpp (+122/-0) 3rdParty/zxing/common/GridSampler.h (+45/-0) 3rdParty/zxing/common/HybridBinarizer.cpp (+221/-0) 3rdParty/zxing/common/HybridBinarizer.h (+68/-0) 3rdParty/zxing/common/IllegalArgumentException.cpp (+31/-0) 3rdParty/zxing/common/IllegalArgumentException.h (+33/-0) 3rdParty/zxing/common/PerspectiveTransform.cpp (+107/-0) 3rdParty/zxing/common/PerspectiveTransform.h (+49/-0) 3rdParty/zxing/common/Point.h (+47/-0) 3rdParty/zxing/common/Str.cpp (+38/-0) 3rdParty/zxing/common/Str.h (+40/-0) 3rdParty/zxing/common/StringUtils.cpp (+198/-0) 3rdParty/zxing/common/StringUtils.h (+52/-0) 3rdParty/zxing/common/detector/MonochromeRectangleDetector.cpp (+171/-0) 3rdParty/zxing/common/detector/MonochromeRectangleDetector.h (+60/-0) 3rdParty/zxing/common/detector/WhiteRectangleDetector.cpp (+336/-0) 3rdParty/zxing/common/detector/WhiteRectangleDetector.h (+61/-0) 3rdParty/zxing/common/reedsolomon/GenericGF.cpp (+147/-0) 3rdParty/zxing/common/reedsolomon/GenericGF.h (+78/-0) 3rdParty/zxing/common/reedsolomon/GenericGFPoly.cpp (+215/-0) 3rdParty/zxing/common/reedsolomon/GenericGFPoly.h (+54/-0) 3rdParty/zxing/common/reedsolomon/ReedSolomonDecoder.cpp (+199/-0) 3rdParty/zxing/common/reedsolomon/ReedSolomonDecoder.h (+48/-0) 3rdParty/zxing/common/reedsolomon/ReedSolomonException.cpp (+30/-0) 3rdParty/zxing/common/reedsolomon/ReedSolomonException.h (+33/-0) 3rdParty/zxing/datamatrix/DataMatrixReader.cpp (+84/-0) 3rdParty/zxing/datamatrix/DataMatrixReader.h (+45/-0) 3rdParty/zxing/datamatrix/DataMatrixVersion.cpp (+199/-0) 3rdParty/zxing/datamatrix/Version.h (+87/-0) 3rdParty/zxing/datamatrix/decoder/BitMatrixParser.h (+59/-0) 3rdParty/zxing/datamatrix/decoder/DataBlock.h (+49/-0) 3rdParty/zxing/datamatrix/decoder/DataMatrixBitMatrixParser.cpp (+361/-0) 3rdParty/zxing/datamatrix/decoder/DataMatrixDataBlock.cpp (+113/-0) 3rdParty/zxing/datamatrix/decoder/DataMatrixDecodedBitStreamParser.cpp (+417/-0) 3rdParty/zxing/datamatrix/decoder/DataMatrixDecoder.cpp (+94/-0) 3rdParty/zxing/datamatrix/decoder/DecodedBitStreamParser.h (+104/-0) 3rdParty/zxing/datamatrix/decoder/Decoder.h (+49/-0) 3rdParty/zxing/datamatrix/detector/CornerPoint.h (+43/-0) 3rdParty/zxing/datamatrix/detector/DataMatrixCornerPoint.cpp (+46/-0) 3rdParty/zxing/datamatrix/detector/DataMatrixDetector.cpp (+434/-0) 3rdParty/zxing/datamatrix/detector/DataMatrixDetectorException.cpp (+23/-0) 3rdParty/zxing/datamatrix/detector/DataMatrixMonochromeRectangleDetector.cpp (+172/-0) 3rdParty/zxing/datamatrix/detector/Detector.h (+94/-0) 3rdParty/zxing/datamatrix/detector/DetectorException.h (+23/-0) 3rdParty/zxing/datamatrix/detector/MonochromeRectangleDetector.h (+61/-0) 3rdParty/zxing/multi/ByQuadrantReader.cpp (+71/-0) 3rdParty/zxing/multi/ByQuadrantReader.h (+40/-0) 3rdParty/zxing/multi/GenericMultipleBarcodeReader.cpp (+128/-0) 3rdParty/zxing/multi/GenericMultipleBarcodeReader.h (+47/-0) 3rdParty/zxing/multi/MultipleBarcodeReader.cpp (+29/-0) 3rdParty/zxing/multi/MultipleBarcodeReader.h (+39/-0) 3rdParty/zxing/multi/qrcode/QRCodeMultiReader.cpp (+57/-0) 3rdParty/zxing/multi/qrcode/QRCodeMultiReader.h (+34/-0) 3rdParty/zxing/multi/qrcode/detector/MultiDetector.cpp (+46/-0) 3rdParty/zxing/multi/qrcode/detector/MultiDetector.h (+35/-0) 3rdParty/zxing/multi/qrcode/detector/MultiFinderPatternFinder.cpp (+230/-0) 3rdParty/zxing/multi/qrcode/detector/MultiFinderPatternFinder.h (+45/-0) 3rdParty/zxing/oned/Code128Reader.cpp (+490/-0) 3rdParty/zxing/oned/Code128Reader.h (+60/-0) 3rdParty/zxing/oned/Code39Reader.cpp (+348/-0) 3rdParty/zxing/oned/Code39Reader.h (+58/-0) 3rdParty/zxing/oned/EAN13Reader.cpp (+99/-0) 3rdParty/zxing/oned/EAN13Reader.h (+44/-0) 3rdParty/zxing/oned/EAN8Reader.cpp (+72/-0) 3rdParty/zxing/oned/EAN8Reader.h (+41/-0) 3rdParty/zxing/oned/ITFReader.cpp (+367/-0) 3rdParty/zxing/oned/ITFReader.h (+53/-0) 3rdParty/zxing/oned/MultiFormatOneDReader.cpp (+66/-0) 3rdParty/zxing/oned/MultiFormatOneDReader.h (+38/-0) 3rdParty/zxing/oned/MultiFormatUPCEANReader.cpp (+87/-0) 3rdParty/zxing/oned/MultiFormatUPCEANReader.h (+38/-0) 3rdParty/zxing/oned/OneDReader.cpp (+207/-0) 3rdParty/zxing/oned/OneDReader.h (+50/-0) 3rdParty/zxing/oned/OneDResultPoint.cpp (+28/-0) 3rdParty/zxing/oned/OneDResultPoint.h (+35/-0) 3rdParty/zxing/oned/UPCAReader.cpp (+65/-0) 3rdParty/zxing/oned/UPCAReader.h (+49/-0) 3rdParty/zxing/oned/UPCEANReader.cpp (+311/-0) 3rdParty/zxing/oned/UPCEANReader.h (+75/-0) 3rdParty/zxing/oned/UPCEReader.cpp (+147/-0) 3rdParty/zxing/oned/UPCEReader.h (+44/-0) 3rdParty/zxing/qrcode/ErrorCorrectionLevel.h (+52/-0) 3rdParty/zxing/qrcode/FormatInformation.h (+54/-0) 3rdParty/zxing/qrcode/QRCodeReader.cpp (+86/-0) 3rdParty/zxing/qrcode/QRCodeReader.h (+47/-0) 3rdParty/zxing/qrcode/QRErrorCorrectionLevel.cpp (+65/-0) 3rdParty/zxing/qrcode/QRFormatInformation.cpp (+118/-0) 3rdParty/zxing/qrcode/QRVersion.cpp (+557/-0) 3rdParty/zxing/qrcode/Version.h (+85/-0) 3rdParty/zxing/qrcode/decoder/BitMatrixParser.h (+56/-0) 3rdParty/zxing/qrcode/decoder/DataBlock.h (+50/-0) 3rdParty/zxing/qrcode/decoder/DataMask.h (+50/-0) 3rdParty/zxing/qrcode/decoder/DecodedBitStreamParser.h (+72/-0) 3rdParty/zxing/qrcode/decoder/Decoder.h (+46/-0) 3rdParty/zxing/qrcode/decoder/Mode.h (+58/-0) 3rdParty/zxing/qrcode/decoder/QRBitMatrixParser.cpp (+186/-0) 3rdParty/zxing/qrcode/decoder/QRDataBlock.cpp (+118/-0) 3rdParty/zxing/qrcode/decoder/QRDataMask.cpp (+159/-0) 3rdParty/zxing/qrcode/decoder/QRDecodedBitStreamParser.cpp (+416/-0) 3rdParty/zxing/qrcode/decoder/QRDecoder.cpp (+102/-0) 3rdParty/zxing/qrcode/decoder/QRMode.cpp (+86/-0) 3rdParty/zxing/qrcode/detector/AlignmentPattern.h (+45/-0) 3rdParty/zxing/qrcode/detector/AlignmentPatternFinder.h (+68/-0) 3rdParty/zxing/qrcode/detector/Detector.h (+66/-0) 3rdParty/zxing/qrcode/detector/FinderPattern.h (+47/-0) 3rdParty/zxing/qrcode/detector/FinderPatternFinder.h (+71/-0) 3rdParty/zxing/qrcode/detector/FinderPatternInfo.h (+47/-0) 3rdParty/zxing/qrcode/detector/QRAlignmentPattern.cpp (+51/-0) 3rdParty/zxing/qrcode/detector/QRAlignmentPatternFinder.cpp (+209/-0) 3rdParty/zxing/qrcode/detector/QRDetector.cpp (+298/-0) 3rdParty/zxing/qrcode/detector/QREdgeDetector.cpp (+168/-0) 3rdParty/zxing/qrcode/detector/QREdgeDetector.h (+48/-0) 3rdParty/zxing/qrcode/detector/QRFinderPattern.cpp (+71/-0) 3rdParty/zxing/qrcode/detector/QRFinderPatternFinder.cpp (+541/-0) 3rdParty/zxing/qrcode/detector/QRFinderPatternInfo.cpp (+41/-0) 3rdParty/zxing/zxing.pro (+199/-0) CMakeLists.txt (+43/-0) com.ubuntu.developer.dplanella.qreator.desktop (+4/-4) manifest.json (+15/-0) qreator-touch.qmlproject (+0/-20) qreator.json (+9/-0) src/CMakeLists.txt (+2/-0) src/app/CMakeLists.txt (+25/-0) src/app/app.pro (+29/-0) src/app/camerahelper.cpp (+65/-0) src/app/camerahelper.h (+42/-0) src/app/main.cpp (+64/-0) src/app/qml/components/Decoder.qml (+19/-4) src/app/qml/components/DeviceOrientation.qml (+5/-5) src/app/qml/qrcodes/QrCodeText.qml (+1/-1) src/app/qml/qrcodes/QrCodeUrl.qml (+1/-1) src/app/qml/qrcodes/QrCodeWifi.qml (+16/-16) src/app/qml/qreator.qml (+44/-63) src/app/qml/ui/CreatorPage.qml (+32/-47) src/app/qml/ui/QrCodeDialog.qml (+4/-0) src/app/qml/ui/QrCodeToolbar.qml (+33/-12) src/app/qml/ui/ScannerPage.qml (+36/-25) src/plugin/CMakeLists.txt (+6/-0) src/plugin/plugin.pro (+2/-0) src/plugin/qzxing/CMakeLists.txt (+34/-0) src/plugin/qzxing/CameraImageWrapper.cpp (+146/-0) src/plugin/qzxing/CameraImageWrapper.h (+47/-0) src/plugin/qzxing/plugins.qmltypes (+84/-0) src/plugin/qzxing/qmldir (+3/-0) src/plugin/qzxing/qzxing.cpp (+124/-0) src/plugin/qzxing/qzxing.h (+79/-0) src/plugin/qzxing/qzxing.pro (+51/-0) src/plugin/qzxing/qzxing_global.h (+12/-0) src/plugin/qzxing/qzxing_plugin.cpp (+17/-0) src/plugin/qzxing/qzxing_plugin.h (+21/-0) src/src.pro (+2/-0)
To merge this branch:	bzr merge lp://staging/~dpm/qreator/qreator-touch-with-plugin
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
Qreator Hackers		2014-05-10	Pending
Review via email: mp+219101@code.staging.launchpad.net

This proposal supersedes a proposal from 2014-05-10.

Description of the change

Initial merge of the QZXing plugin into the app's code, and conversion to CMake. Now the app and the plugin can be built and distributed together in a click package. The .deb packaging will still generate 2 independent packages, but it will probably require some more fixes.