diff -Nru robocut-1.0.6/changelog robocut-1.0.8/changelog --- robocut-1.0.6/changelog 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/changelog 2011-08-13 20:35:08.000000000 +0000 @@ -1,3 +1,9 @@ +1.0.8 + * changes in Robocut.pro for qmake so no QT files are shipped (Debian requirement) + +1.0.7 + * Add USB ID 111C as another default. + 1.0.6 * Tim fixed drawing bug * changed from float to int for output to plotter, fixes crash of 2nd diff -Nru robocut-1.0.6/debian/changelog robocut-1.0.8/debian/changelog --- robocut-1.0.6/debian/changelog 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/debian/changelog 2011-08-13 20:51:18.000000000 +0000 @@ -1,3 +1,12 @@ +robocut (1.0.8-1) unstable; urgency=low + + * Add two more example registration mark files + * Add USB ID 111C as another default + * add debian/README.source + * removed $SOURCES/usr/share/qt4/mkspecs files + + -- Markus Schulz Sat, 06 Aug 2011 03:33:00 -0500 + robocut (1.0.6-1) unstable; urgency=low * Initial release. (Closes: #605345) diff -Nru robocut-1.0.6/debian/control robocut-1.0.8/debian/control --- robocut-1.0.6/debian/control 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/debian/control 2011-08-13 20:51:18.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Markus Schulz Build-Depends: debhelper (>= 7), quilt, libqt4-dev, libusb-1.0-0-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: https://code.launchpad.net/robocut Vcs-Git: git://gitorious.org/~alpharesearch/robocut/alpharesearchs-robocut.git Vcs-Browser: http://gitorious.org/~alpharesearch/robocut/alpharesearchs-robocut diff -Nru robocut-1.0.6/debian/copyright robocut-1.0.8/debian/copyright --- robocut-1.0.6/debian/copyright 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/debian/copyright 2011-08-13 20:51:18.000000000 +0000 @@ -11,8 +11,9 @@ Markus Schulz Copyright: - Copyright © 2010 by Tim Hutt - Copyright © 2010 by Markus Schulz + © 2010 by Tim Hutt + © 2010 by Markus Schulz + License: This program is free software: you can redistribute it and/or modify @@ -35,4 +36,16 @@ Copyright © 2010 Markus Schulz -and is licensed under the GPL version 3, see above. \ No newline at end of file +and is licensed under the GPL version 3, see above. + +On Debian systems, the complete text of the GNU General Public License +can be found in `/usr/share/common-licenses/LGPL-2.2`, +`/usr/share/common-licenses/GPL-2` and `/usr/share/common-licenses/GPL-3`. + +Files: * +Copyright: 2010-2011 Tim Hutt and or Markus Schulz +License: GPL-3+ + +Files: debian/* +Copyright: 2010-2011 Markus Schulz +License: GPL-3+ diff -Nru robocut-1.0.6/debian/README.source robocut-1.0.8/debian/README.source --- robocut-1.0.6/debian/README.source 1970-01-01 00:00:00.000000000 +0000 +++ robocut-1.0.8/debian/README.source 2011-08-13 20:51:18.000000000 +0000 @@ -0,0 +1,29 @@ +This is what I do to build a new version and a new package. +* checkout master + If there need to be new program version: + * change version number in Robocut.pro and main.cpp + +* To create a new tar file I do this: + qmake + make -j + make clean + make release + +* checkout debian branch + +* some steps now are done via the autodist.sh script, like: + * call dch -i + * use help2man --name="is used with cutting plotters." -N ./robocut -i ./manfile.txt -o ./debian/robocut.1 + * create a ddist folder and copy the tar.gz file in this folder and rename it to orig.tar.gz and build + mkdir ddist + cp robocut*.tar.gz ./ddist/ + cd ddist + tar -xvzf robocut*.tar.gz + rename -v 's/\.tar\.gz$/\.orig\.tar\.gz/' *.tar.gz + cd robocut* + mkdir debian + cd ../.. + cp -r ./debian/* ./ddist/robocut*/debian + cd ddist + cd robocut* + debuild -S diff -Nru robocut-1.0.6/debian/robocut.1 robocut-1.0.8/debian/robocut.1 --- robocut-1.0.6/debian/robocut.1 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/debian/robocut.1 2011-08-13 20:51:18.000000000 +0000 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH ROBOCUT "1" "December 2010" "Robocut V1.0.6" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.4. +.TH ROBOCUT "1" "August 2011" "Robocut V1.0.8" "User Commands" .SH NAME Robocut \- is used with cutting plotters. .SH DESCRIPTION diff -Nru robocut-1.0.6/debian/robocut.install robocut-1.0.8/debian/robocut.install --- robocut-1.0.6/debian/robocut.install 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/debian/robocut.install 2011-08-13 20:51:18.000000000 +0000 @@ -1,4 +1,6 @@ ### example for for the registration marks examples/letter_reg-marks.svg /usr/share/robocut +examples/a4_reg-marks_h260.svg /usr/share/robocut +examples/legal_reg-marks_h310.svg /usr/share/robocut ### Menus, icons debian/misc/robocut.desktop /usr/share/applications diff -Nru robocut-1.0.6/debian/watch robocut-1.0.8/debian/watch --- robocut-1.0.6/debian/watch 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/debian/watch 2011-08-13 20:51:18.000000000 +0000 @@ -1,7 +1,4 @@ -# Example watch control file for uscan -# Rename this file to "watch" and then you can run the "uscan" command -# to check for upstream updates and more. -# See uscan(1) for format +# Run the "uscan" command # Compulsory line, this is a version 3 file version=3 diff -Nru robocut-1.0.6/examples/a4_reg-marks_h260.svg robocut-1.0.8/examples/a4_reg-marks_h260.svg --- robocut-1.0.6/examples/a4_reg-marks_h260.svg 1970-01-01 00:00:00.000000000 +0000 +++ robocut-1.0.8/examples/a4_reg-marks_h260.svg 2011-08-13 20:35:08.000000000 +0000 @@ -0,0 +1,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + Markus Schulz + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru robocut-1.0.6/examples/legal_reg-marks_h310.svg robocut-1.0.8/examples/legal_reg-marks_h310.svg --- robocut-1.0.6/examples/legal_reg-marks_h310.svg 1970-01-01 00:00:00.000000000 +0000 +++ robocut-1.0.8/examples/legal_reg-marks_h310.svg 2011-08-13 20:35:08.000000000 +0000 @@ -0,0 +1,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + Markus Schulz + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru robocut-1.0.6/main.cpp robocut-1.0.8/main.cpp --- robocut-1.0.6/main.cpp 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/main.cpp 2011-08-13 20:35:08.000000000 +0000 @@ -31,7 +31,7 @@ int main(int argc, char *argv[]) { - ProgramOptions::Instance().setVersion("Robocut V1.0.6"); // would be nice if this could be imported from qmake + ProgramOptions::Instance().setVersion("Robocut V1.0.8"); // would be nice if this could be imported from qmake ProgramOptions::Instance().GetOpt(argc, argv); int err = libusb_init(NULL); if (err != LIBUSB_SUCCESS) diff -Nru robocut-1.0.6/manfile.txt robocut-1.0.8/manfile.txt --- robocut-1.0.6/manfile.txt 1970-01-01 00:00:00.000000000 +0000 +++ robocut-1.0.8/manfile.txt 2011-08-13 20:35:08.000000000 +0000 @@ -0,0 +1,2 @@ +[ENVIRONMENT] +QT SVG only supports the SVG 1.2 Tiny standard and this has a limited SVG support. For example multiline text is something that is no supported by Robocut, however you can export your text to a path or just create each line separate. diff -Nru robocut-1.0.6/moc_CutDialog.cpp robocut-1.0.8/moc_CutDialog.cpp --- robocut-1.0.6/moc_CutDialog.cpp 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/moc_CutDialog.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CutDialog.h' -** -** Created: Sun Dec 5 18:49:02 2010 -** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "CutDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CutDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.7.0. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CutDialog[] = { - - // content: - 5, // revision - 0, // classname - 0, 0, // classinfo - 1, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 11, 10, 10, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_CutDialog[] = { - "CutDialog\0\0idx\0onMediaChanged(int)\0" -}; - -const QMetaObject CutDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_CutDialog, - qt_meta_data_CutDialog, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CutDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CutDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CutDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CutDialog)) - return static_cast(const_cast< CutDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int CutDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - switch (_id) { - case 0: onMediaChanged((*reinterpret_cast< int(*)>(_a[1]))); break; - default: ; - } - _id -= 1; - } - return _id; -} -QT_END_MOC_NAMESPACE diff -Nru robocut-1.0.6/moc_CuttingDialog.cpp robocut-1.0.8/moc_CuttingDialog.cpp --- robocut-1.0.6/moc_CuttingDialog.cpp 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/moc_CuttingDialog.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CuttingDialog.h' -** -** Created: Sun Dec 5 18:49:02 2010 -** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "CuttingDialog.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CuttingDialog.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.7.0. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CuttingDialog[] = { - - // content: - 5, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x08, - 35, 27, 14, 14, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_CuttingDialog[] = { - "CuttingDialog\0\0onSuccess()\0message\0" - "onError(QString)\0" -}; - -const QMetaObject CuttingDialog::staticMetaObject = { - { &QDialog::staticMetaObject, qt_meta_stringdata_CuttingDialog, - qt_meta_data_CuttingDialog, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CuttingDialog::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CuttingDialog::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CuttingDialog::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CuttingDialog)) - return static_cast(const_cast< CuttingDialog*>(this)); - return QDialog::qt_metacast(_clname); -} - -int CuttingDialog::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QDialog::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - switch (_id) { - case 0: onSuccess(); break; - case 1: onError((*reinterpret_cast< QString(*)>(_a[1]))); break; - default: ; - } - _id -= 2; - } - return _id; -} -QT_END_MOC_NAMESPACE diff -Nru robocut-1.0.6/moc_CuttingThread.cpp robocut-1.0.8/moc_CuttingThread.cpp --- robocut-1.0.6/moc_CuttingThread.cpp 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/moc_CuttingThread.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,95 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'CuttingThread.h' -** -** Created: Sun Dec 5 18:49:02 2010 -** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "CuttingThread.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'CuttingThread.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.7.0. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_CuttingThread[] = { - - // content: - 5, // revision - 0, // classname - 0, 0, // classinfo - 2, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 2, // signalCount - - // signals: signature, parameters, type, tag, flags - 15, 14, 14, 14, 0x05, - 33, 25, 14, 14, 0x05, - - 0 // eod -}; - -static const char qt_meta_stringdata_CuttingThread[] = { - "CuttingThread\0\0success()\0message\0" - "error(QString)\0" -}; - -const QMetaObject CuttingThread::staticMetaObject = { - { &QThread::staticMetaObject, qt_meta_stringdata_CuttingThread, - qt_meta_data_CuttingThread, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &CuttingThread::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *CuttingThread::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *CuttingThread::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_CuttingThread)) - return static_cast(const_cast< CuttingThread*>(this)); - return QThread::qt_metacast(_clname); -} - -int CuttingThread::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QThread::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - switch (_id) { - case 0: success(); break; - case 1: error((*reinterpret_cast< QString(*)>(_a[1]))); break; - default: ; - } - _id -= 2; - } - return _id; -} - -// SIGNAL 0 -void CuttingThread::success() -{ - QMetaObject::activate(this, &staticMetaObject, 0, 0); -} - -// SIGNAL 1 -void CuttingThread::error(QString _t1) -{ - void *_a[] = { 0, const_cast(reinterpret_cast(&_t1)) }; - QMetaObject::activate(this, &staticMetaObject, 1, _a); -} -QT_END_MOC_NAMESPACE diff -Nru robocut-1.0.6/moc_MainWindow.cpp robocut-1.0.8/moc_MainWindow.cpp --- robocut-1.0.6/moc_MainWindow.cpp 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/moc_MainWindow.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,105 +0,0 @@ -/**************************************************************************** -** Meta object code from reading C++ file 'MainWindow.h' -** -** Created: Sun Dec 5 18:49:02 2010 -** by: The Qt Meta Object Compiler version 62 (Qt 4.7.0) -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include "MainWindow.h" -#if !defined(Q_MOC_OUTPUT_REVISION) -#error "The header file 'MainWindow.h' doesn't include ." -#elif Q_MOC_OUTPUT_REVISION != 62 -#error "This file was generated using the moc from 4.7.0. It" -#error "cannot be used with the include files from this version of Qt." -#error "(The moc has changed too much.)" -#endif - -QT_BEGIN_MOC_NAMESPACE -static const uint qt_meta_data_MainWindow[] = { - - // content: - 5, // revision - 0, // classname - 0, 0, // classinfo - 10, 14, // methods - 0, 0, // properties - 0, 0, // enums/sets - 0, 0, // constructors - 0, // flags - 0, // signalCount - - // slots: signature, parameters, type, tag, flags - 12, 11, 11, 11, 0x08, - 42, 11, 11, 11, 0x08, - 71, 11, 11, 11, 0x08, - 106, 98, 11, 11, 0x08, - 137, 11, 11, 11, 0x08, - 165, 11, 11, 11, 0x08, - 190, 11, 11, 11, 0x08, - 216, 11, 11, 11, 0x08, - 243, 11, 11, 11, 0x08, - 269, 11, 11, 11, 0x08, - - 0 // eod -}; - -static const char qt_meta_stringdata_MainWindow[] = { - "MainWindow\0\0on_actionZoom_Out_triggered()\0" - "on_actionZoom_In_triggered()\0" - "on_actionReset_triggered()\0animate\0" - "on_actionAnimate_toggled(bool)\0" - "on_actionManual_triggered()\0" - "on_actionCut_triggered()\0" - "on_actionExit_triggered()\0" - "on_actionAbout_triggered()\0" - "on_actionOpen_triggered()\0animate()\0" -}; - -const QMetaObject MainWindow::staticMetaObject = { - { &QMainWindow::staticMetaObject, qt_meta_stringdata_MainWindow, - qt_meta_data_MainWindow, 0 } -}; - -#ifdef Q_NO_DATA_RELOCATION -const QMetaObject &MainWindow::getStaticMetaObject() { return staticMetaObject; } -#endif //Q_NO_DATA_RELOCATION - -const QMetaObject *MainWindow::metaObject() const -{ - return QObject::d_ptr->metaObject ? QObject::d_ptr->metaObject : &staticMetaObject; -} - -void *MainWindow::qt_metacast(const char *_clname) -{ - if (!_clname) return 0; - if (!strcmp(_clname, qt_meta_stringdata_MainWindow)) - return static_cast(const_cast< MainWindow*>(this)); - return QMainWindow::qt_metacast(_clname); -} - -int MainWindow::qt_metacall(QMetaObject::Call _c, int _id, void **_a) -{ - _id = QMainWindow::qt_metacall(_c, _id, _a); - if (_id < 0) - return _id; - if (_c == QMetaObject::InvokeMetaMethod) { - switch (_id) { - case 0: on_actionZoom_Out_triggered(); break; - case 1: on_actionZoom_In_triggered(); break; - case 2: on_actionReset_triggered(); break; - case 3: on_actionAnimate_toggled((*reinterpret_cast< bool(*)>(_a[1]))); break; - case 4: on_actionManual_triggered(); break; - case 5: on_actionCut_triggered(); break; - case 6: on_actionExit_triggered(); break; - case 7: on_actionAbout_triggered(); break; - case 8: on_actionOpen_triggered(); break; - case 9: animate(); break; - default: ; - } - _id -= 10; - } - return _id; -} -QT_END_MOC_NAMESPACE diff -Nru robocut-1.0.6/Plotter.cpp robocut-1.0.8/Plotter.cpp --- robocut-1.0.6/Plotter.cpp 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/Plotter.cpp 2011-08-13 20:35:08.000000000 +0000 @@ -24,9 +24,12 @@ #include -const int VENDOR_ID_GRAPHTEC = ProgramOptions::Instance().getVendorUSB_ID(); //0x0b4d; + int VENDOR_ID = ProgramOptions::Instance().getVendorUSB_ID(); +const int VENDOR_ID_GRAPHTEC = 0x0b4d; + int PRODUCT_ID = ProgramOptions::Instance().getProductUSB_ID(); const int PRODUCT_ID_CC200_20 = 0x110a; -const int PRODUCT_ID_SILHOUETTE_SD = ProgramOptions::Instance().getProductUSB_ID(); //0x111d; // Possibly the same as CC330-20. +const int PRODUCT_ID_SILHOUETTE_SD_1 = 0x111c; +const int PRODUCT_ID_SILHOUETTE_SD_2 = 0x111d; #include #include @@ -127,7 +130,11 @@ Error Cut(QList cuts, double mediawidth, double mediaheight, int media, int speed, int pressure, bool trackenhancing, bool regmark, bool regsearch, double regwidth, double reglength) { - cout << "Cutting. mediawidth: " << mediawidth << " mediaheight: " << mediaheight + VENDOR_ID = ProgramOptions::Instance().getVendorUSB_ID(); + PRODUCT_ID = ProgramOptions::Instance().getProductUSB_ID(); + + cout << "Cutting... VENDOR_ID : " << VENDOR_ID << " PRODUCT_ID: " << PRODUCT_ID + << " mediawidth: " << mediawidth << " mediaheight: " << mediaheight << "media: " << media << " speed: " << speed << " pressure: " << pressure << " trackenhancing: " << trackenhancing << " regmark: " << regmark << " regsearch:" << regsearch <<" regwidth:" << regwidth << " reglength: " << reglength << endl; @@ -157,8 +164,8 @@ libusb_device_descriptor desc; libusb_get_device_descriptor(device, &desc); // I don't want to be more specific than this really. - if (desc.idVendor == VENDOR_ID_GRAPHTEC && - (desc.idProduct == PRODUCT_ID_CC200_20 || desc.idProduct == PRODUCT_ID_SILHOUETTE_SD)) + if ((desc.idVendor == VENDOR_ID || desc.idVendor == VENDOR_ID_GRAPHTEC) && + (desc.idProduct == PRODUCT_ID || desc.idProduct == PRODUCT_ID_CC200_20 || desc.idProduct == PRODUCT_ID_SILHOUETTE_SD_1 || desc.idProduct == PRODUCT_ID_SILHOUETTE_SD_2)) { // Just use the first one. Who has two?! found = device; diff -Nru robocut-1.0.6/qrc_resources.cpp robocut-1.0.8/qrc_resources.cpp --- robocut-1.0.6/qrc_resources.cpp 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/qrc_resources.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,302 +0,0 @@ -/**************************************************************************** -** Resource object code -** -** Created: Sun Dec 5 18:49:02 2010 -** by: The Resource Compiler for Qt version 4.7.0 -** -** WARNING! All changes made in this file will be lost! -*****************************************************************************/ - -#include - -static const unsigned char qt_resource_data[] = { - // /home/markus/alpharesearchs-robocut/images/cap-yellow.png - 0x0,0x0,0x2,0x73, - 0x89, - 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, - 0x0,0x0,0x40,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0xaa,0x69,0x71,0xde, - 0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0, - 0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0, - 0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1, - 0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0xc,0x4, - 0x12,0x0,0x0,0x2a,0x41,0x98,0xa1,0x0,0x0,0x0,0x7f,0x74,0x45,0x58,0x74,0x43, - 0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x54,0x68,0x69,0x73,0x20,0x64,0x72,0x61,0x77, - 0x69,0x6e,0x67,0x20,0x69,0x73,0x3a,0xa,0xa,0x20,0x20,0x20,0x20,0x43,0x6f,0x70, - 0x79,0x72,0x69,0x67,0x68,0x74,0x20,0xa9,0x20,0x32,0x30,0x31,0x30,0x20,0x4d,0x61, - 0x72,0x6b,0x75,0x73,0x20,0x53,0x63,0x68,0x75,0x6c,0x7a,0x20,0x3c,0x73,0x63,0x68, - 0x75,0x6c,0x7a,0x40,0x61,0x6c,0x70,0x68,0x61,0x72,0x65,0x73,0x65,0x61,0x72,0x63, - 0x68,0x2e,0x64,0x65,0x3e,0xa,0xa,0x61,0x6e,0x64,0x20,0x69,0x73,0x20,0x6c,0x69, - 0x63,0x65,0x6e,0x73,0x65,0x64,0x20,0x75,0x6e,0x64,0x65,0x72,0x20,0x74,0x68,0x65, - 0x20,0x47,0x50,0x4c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0xf1,0x81, - 0xf2,0x77,0x0,0x0,0x1,0x68,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x58,0x31,0x4e, - 0xc4,0x30,0x10,0x1c,0x5b,0x91,0x45,0xcb,0x7f,0x78,0x47,0x1e,0x41,0x79,0xc5,0x3d, - 0x82,0x82,0x92,0x47,0xe4,0x1,0xd4,0x3c,0x85,0x82,0x9e,0xf6,0x14,0x45,0x59,0x9a, - 0x44,0x2,0xe9,0x72,0x42,0x7,0xf6,0x4e,0x6e,0x76,0x24,0x57,0x51,0x1c,0x79,0x32, - 0xb3,0xeb,0x1d,0x20,0x10,0x8,0x4,0x84,0x91,0xb6,0x1e,0xd8,0x74,0x6f,0xbf,0xdb, - 0xe1,0x11,0xc8,0x7,0xc0,0x5e,0x1,0x7b,0x2,0xec,0x83,0xf3,0xa0,0xdd,0xe7,0xd9, - 0xb3,0xe6,0xbf,0x6f,0x3d,0x2d,0x2b,0x3,0x28,0xbb,0x53,0xc0,0x3f,0x12,0xd0,0x2d, - 0x4b,0x8e,0x80,0x79,0x59,0x59,0x99,0x80,0xd5,0x2,0x59,0xd9,0x2,0x45,0x55,0x1, - 0xd3,0x37,0xb,0x64,0x65,0xb,0x74,0xc2,0xa,0xb0,0x28,0x82,0xcb,0xe1,0xb3,0x7a, - 0xd,0x88,0x36,0xa8,0xde,0x6,0xe5,0x2d,0x50,0x54,0x2d,0xb0,0xdf,0x7b,0x40,0xe4, - 0x1,0xd7,0xbc,0x74,0x5d,0x56,0xf0,0xc,0xd8,0x7b,0xf3,0x79,0xbf,0x81,0x5,0xf6, - 0x8d,0xca,0x4,0x4c,0xf4,0x2d,0xb2,0x11,0x1,0xbc,0x73,0x42,0x65,0x2,0xf8,0xc3, - 0x92,0x6,0x4,0x84,0x5,0xc0,0x1c,0x96,0x34,0x20,0x60,0x56,0x56,0x0,0x7f,0x58, - 0x52,0x5f,0x1,0x16,0x45,0x10,0xcc,0x61,0x49,0xc3,0x1a,0x10,0x6d,0x50,0xbd,0xd, - 0xca,0x5b,0xa0,0xa8,0x5a,0x20,0xc2,0x12,0x6a,0xa4,0x1a,0x9b,0x5e,0xc,0x4c,0xd2, - 0x3,0x90,0x5f,0x0,0x7b,0x3,0xe6,0x23,0x80,0x53,0xd5,0xc0,0xc3,0xd9,0x2,0x5b, - 0x75,0x61,0xa4,0xb1,0x85,0x13,0x1,0x6b,0x67,0xb8,0x13,0x25,0xc0,0x46,0x9a,0xcb, - 0x51,0x63,0x2,0xc6,0x9f,0xa,0x48,0x72,0x4,0x14,0xb0,0xc5,0x64,0xce,0x45,0x50, - 0x96,0x0,0x9e,0x94,0xc8,0x91,0x0,0x55,0x5,0xd8,0x6a,0x1,0x8e,0x1,0xc9,0x51, - 0x1,0x1d,0xc5,0x80,0xd4,0x9e,0x80,0xb4,0xfe,0xf9,0x99,0xc2,0x2,0xa9,0xf5,0x7, - 0x87,0x61,0xd8,0x9c,0x13,0xfa,0xbe,0x4f,0x37,0xaf,0x0,0x8f,0x43,0x92,0xd5,0x0, - 0x2e,0x12,0xdc,0xca,0x30,0xb,0x9,0xae,0x7d,0x88,0x81,0x4,0xf7,0x46,0xcc,0x56, - 0x13,0xdc,0x70,0xa9,0x3b,0x4,0x2,0x81,0x40,0x20,0x10,0xa8,0x82,0x2f,0x61,0x88, - 0x7b,0x6d,0x7,0x26,0x94,0xae,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42, - 0x60,0x82, - // /home/markus/alpharesearchs-robocut/images/cap-pen.png - 0x0,0x0,0x2,0xef, - 0x89, - 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, - 0x0,0x0,0x40,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0xaa,0x69,0x71,0xde, - 0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0, - 0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0, - 0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1, - 0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0xc,0x4, - 0x12,0x2,0x4,0x1f,0x1a,0x3e,0x3a,0x0,0x0,0x0,0x7f,0x74,0x45,0x58,0x74,0x43, - 0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x54,0x68,0x69,0x73,0x20,0x64,0x72,0x61,0x77, - 0x69,0x6e,0x67,0x20,0x69,0x73,0x3a,0xa,0xa,0x20,0x20,0x20,0x20,0x43,0x6f,0x70, - 0x79,0x72,0x69,0x67,0x68,0x74,0x20,0xa9,0x20,0x32,0x30,0x31,0x30,0x20,0x4d,0x61, - 0x72,0x6b,0x75,0x73,0x20,0x53,0x63,0x68,0x75,0x6c,0x7a,0x20,0x3c,0x73,0x63,0x68, - 0x75,0x6c,0x7a,0x40,0x61,0x6c,0x70,0x68,0x61,0x72,0x65,0x73,0x65,0x61,0x72,0x63, - 0x68,0x2e,0x64,0x65,0x3e,0xa,0xa,0x61,0x6e,0x64,0x20,0x69,0x73,0x20,0x6c,0x69, - 0x63,0x65,0x6e,0x73,0x65,0x64,0x20,0x75,0x6e,0x64,0x65,0x72,0x20,0x74,0x68,0x65, - 0x20,0x47,0x50,0x4c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0xf1,0x81, - 0xf2,0x77,0x0,0x0,0x1,0xe4,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0xd9,0x39,0x2c, - 0x44,0x41,0x1c,0xc7,0xf1,0xaf,0x44,0x90,0x8,0x4b,0xe5,0xe8,0x5c,0x9d,0xab,0x15, - 0x6a,0x96,0x96,0x50,0xbb,0x6a,0x42,0x8d,0x90,0xe8,0x5c,0x35,0xa1,0x76,0xb5,0xae, - 0x4e,0x5c,0xad,0xa3,0x24,0x4a,0x47,0x65,0x69,0xd0,0xf0,0x14,0xfb,0x5e,0xf2,0xb2, - 0x89,0xfb,0xcd,0xe4,0x3f,0xf3,0xe6,0x97,0xfc,0xb3,0xc5,0x56,0x9f,0x37,0xf3,0x36, - 0xfb,0x9b,0x1,0x17,0x17,0x17,0x17,0x17,0x17,0xdb,0x92,0x1f,0x57,0x78,0x31,0x70, - 0xc,0x5c,0xc4,0x11,0xdf,0x1,0x3c,0x1,0x9e,0x3f,0x13,0x71,0xc2,0x2f,0x84,0xe0, - 0xe1,0x69,0xb6,0x1d,0x5e,0xe3,0x6f,0x77,0xef,0x93,0xb9,0x5,0x72,0x6d,0xc5,0xf, - 0x7e,0x1,0xf,0xcf,0xba,0x6d,0xf0,0x3c,0x60,0xf3,0x87,0xf8,0x60,0xfa,0x6d,0xc1, - 0xb7,0x0,0xf7,0xbf,0xc4,0x7b,0xc0,0x3b,0x50,0x65,0x3a,0x7e,0xea,0xf,0xf0,0xf0, - 0x9c,0x9b,0xa,0x2f,0x7,0x4e,0xfe,0x89,0xf,0x66,0xce,0x34,0x7c,0xf,0xf0,0x1a, - 0x11,0x3e,0x98,0xa4,0x9,0xf0,0x2c,0x60,0x25,0x62,0x78,0x30,0x8f,0x40,0x42,0x32, - 0xbe,0x11,0xb8,0x56,0x84,0xf,0x66,0x5f,0x2a,0x7e,0x54,0x31,0xdc,0x3,0x1e,0xfc, - 0xbf,0xcd,0xa2,0x52,0x4,0xec,0x69,0xc0,0x6f,0x1,0x5,0xd2,0xf0,0xed,0xfe,0x7b, - 0xa9,0x1a,0x3f,0x24,0x71,0xcb,0xcf,0x6b,0x80,0x5f,0x2,0xb5,0xd2,0xe0,0xd5,0xdf, - 0x94,0x98,0xa8,0x66,0x51,0xe2,0xaa,0xf,0x68,0x80,0x3f,0x3,0x9d,0x12,0x4b,0xcc, - 0x86,0x6,0xfc,0x1,0x50,0x22,0xb1,0xc4,0xdc,0x69,0xc0,0x8f,0x49,0xdc,0xf2,0x93, - 0x1a,0xe0,0x37,0x40,0x93,0x34,0x78,0x99,0x7f,0x40,0xa9,0x1a,0xbf,0xa,0xe4,0x48, - 0xc3,0x77,0x2b,0x28,0x31,0x99,0xf3,0x6,0xf4,0x4a,0x2c,0x31,0xcb,0x1a,0x56,0xfd, - 0x14,0xa8,0x90,0x86,0x6f,0xd0,0x50,0x62,0x3c,0x60,0x46,0xe2,0xf,0xdd,0x88,0xa6, - 0x12,0xd3,0x2a,0xd,0x9e,0x0,0x76,0x35,0xe0,0xb7,0x81,0x42,0x69,0xf8,0x64,0x9c, - 0x4b,0xcc,0x9c,0x6,0xf8,0x15,0x50,0x27,0xd,0x5e,0xe5,0x9f,0xae,0xc6,0xb2,0xc4, - 0xf4,0x93,0x3e,0x5f,0x57,0x9,0x7f,0x1,0xba,0xa4,0xc1,0x73,0x49,0x5f,0x2f,0xa9, - 0x5e,0xf5,0x43,0x89,0x25,0xa6,0x99,0xf4,0x5,0xa3,0x6a,0xfc,0x78,0x5c,0xf,0x28, - 0x45,0x96,0x98,0x70,0x85,0x55,0x89,0x5f,0x93,0x58,0x62,0x32,0xa3,0x2,0xfe,0xe, - 0xf4,0x61,0x48,0xa2,0xc6,0x9f,0x1,0x95,0x26,0xe2,0x9f,0x23,0xc0,0xcf,0x62,0x58, - 0xa2,0x5a,0xf5,0x14,0xd0,0x86,0x81,0x89,0x2,0xbf,0x83,0xf0,0x8b,0x48,0x95,0xf8, - 0x61,0xc,0x4d,0x14,0x25,0xa6,0x1e,0x83,0xf3,0x1f,0xfc,0x12,0x86,0xc7,0xaa,0x12, - 0xa3,0xfa,0x1,0xa4,0xfc,0xcf,0x23,0xa0,0x14,0x4b,0xf2,0x1d,0x3a,0x9c,0x36,0x60, - 0xda,0x74,0x70,0x56,0x6,0xfe,0xab,0xef,0xad,0x4c,0xf6,0xf,0x1e,0x8c,0x8b,0x8b, - 0x8b,0x8b,0x8b,0x8b,0x8b,0x8b,0x8b,0x8d,0xf9,0x0,0x8c,0xcb,0xa4,0xa,0x6e,0x36, - 0x0,0x78,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - // /home/markus/alpharesearchs-robocut/images/icon.png - 0x0,0x0,0x1,0x15, - 0x89, - 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, - 0x0,0x0,0x20,0x0,0x0,0x0,0x20,0x8,0x6,0x0,0x0,0x0,0x73,0x7a,0x7a,0xf4, - 0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0, - 0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0, - 0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1, - 0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0xc,0x4, - 0x11,0x0,0x10,0x35,0xb0,0x36,0x9c,0x0,0x0,0x0,0x95,0x49,0x44,0x41,0x54,0x58, - 0xc3,0xed,0x95,0xcd,0xa,0x83,0x30,0x10,0x84,0x67,0x8b,0x17,0x1f,0xb4,0x7d,0x87, - 0x3c,0x8e,0xbe,0xa4,0x17,0x61,0x7a,0x68,0xa9,0xd1,0x4c,0xcc,0xa1,0x94,0x14,0x9c, - 0xf,0x42,0x7e,0x76,0xc3,0xc,0x4b,0x74,0x1,0x73,0x75,0x22,0xdf,0x10,0xa0,0x48, - 0xd8,0x72,0x6,0x16,0x71,0xac,0xf1,0x89,0x2f,0x2c,0xef,0x8f,0xb1,0xd7,0xd8,0xa4, - 0x5e,0xe7,0x21,0x22,0x94,0xe2,0xca,0x44,0x26,0xae,0x4c,0xb4,0xc4,0xab,0xa8,0x4a, - 0x54,0x4d,0x8,0x54,0x25,0x32,0xf1,0x6e,0xd0,0x2f,0xde,0x18,0xf3,0xbf,0xcd,0x88, - 0xe4,0x4f,0xfe,0x52,0x11,0xd1,0x4c,0xb9,0xf5,0xae,0x80,0xd,0xb4,0xd,0xcc,0x8f, - 0x72,0x7d,0x9c,0xbf,0xee,0x93,0x35,0xa6,0xfb,0x7e,0x3e,0x5b,0xb,0xde,0x2d,0xf8, - 0x6c,0xf4,0xff,0xa,0x6,0x0,0x48,0x29,0xf9,0x11,0xda,0xc0,0x75,0xd,0x98,0x27, - 0xf,0x1a,0x84,0x59,0xe8,0xb9,0x5b,0xfe,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44, - 0xae,0x42,0x60,0x82, - // /home/markus/alpharesearchs-robocut/images/cap-blue.png - 0x0,0x0,0x2,0xc4, - 0x89, - 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, - 0x0,0x0,0x40,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0xaa,0x69,0x71,0xde, - 0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0, - 0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0, - 0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1, - 0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0xc,0x4, - 0x12,0x0,0xa,0xca,0x94,0x71,0xbf,0x0,0x0,0x0,0x7f,0x74,0x45,0x58,0x74,0x43, - 0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x54,0x68,0x69,0x73,0x20,0x64,0x72,0x61,0x77, - 0x69,0x6e,0x67,0x20,0x69,0x73,0x3a,0xa,0xa,0x20,0x20,0x20,0x20,0x43,0x6f,0x70, - 0x79,0x72,0x69,0x67,0x68,0x74,0x20,0xa9,0x20,0x32,0x30,0x31,0x30,0x20,0x4d,0x61, - 0x72,0x6b,0x75,0x73,0x20,0x53,0x63,0x68,0x75,0x6c,0x7a,0x20,0x3c,0x73,0x63,0x68, - 0x75,0x6c,0x7a,0x40,0x61,0x6c,0x70,0x68,0x61,0x72,0x65,0x73,0x65,0x61,0x72,0x63, - 0x68,0x2e,0x64,0x65,0x3e,0xa,0xa,0x61,0x6e,0x64,0x20,0x69,0x73,0x20,0x6c,0x69, - 0x63,0x65,0x6e,0x73,0x65,0x64,0x20,0x75,0x6e,0x64,0x65,0x72,0x20,0x74,0x68,0x65, - 0x20,0x47,0x50,0x4c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0xf1,0x81, - 0xf2,0x77,0x0,0x0,0x1,0xb9,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x58,0x31,0x4e, - 0xc3,0x40,0x10,0x1c,0x9f,0xcf,0x86,0x96,0x87,0x50,0xd2,0xf1,0xe,0x97,0x54,0x54, - 0x94,0x14,0xbc,0x0,0x51,0x50,0x50,0x22,0x24,0x7e,0xe0,0x7,0xd0,0x42,0x49,0xcf, - 0x7,0x28,0x22,0x51,0xa6,0xd,0xce,0xf9,0x4c,0x61,0x7,0x5b,0x88,0x4,0x14,0xb8, - 0xbd,0xbd,0xec,0x4e,0x1b,0xc5,0x96,0x47,0x33,0xb3,0xbb,0x3,0x28,0x14,0xa,0x85, - 0x60,0x64,0xeb,0x7e,0x38,0x38,0xec,0xba,0xdf,0x3c,0xe0,0xec,0x4,0x38,0x3f,0x5, - 0x1e,0x1e,0x81,0xeb,0x3b,0x60,0xf6,0xc6,0xf3,0x43,0xe7,0x2f,0xd9,0xb7,0xdf,0x6a, - 0xfe,0xfa,0x60,0xe7,0x0,0xd7,0x2,0xc6,0x0,0x65,0x91,0x9e,0x2,0xfe,0x87,0x0, - 0x7,0xd8,0x1c,0xb0,0x56,0x20,0x1,0xbe,0x3,0xbc,0xef,0x15,0x60,0x73,0x89,0x4, - 0xf8,0xd1,0x2,0xc6,0x8,0xb6,0x40,0x59,0x8,0x55,0x80,0x6b,0x47,0xb,0x88,0x54, - 0xc0,0xca,0x2,0x62,0x43,0x70,0xaa,0x0,0xd1,0x21,0x68,0xad,0xe0,0x10,0xf4,0x1e, - 0x30,0x99,0x54,0x5,0x74,0x3d,0x9,0xb2,0xc7,0x60,0xdb,0x8f,0x41,0xd9,0x16,0x90, - 0x7a,0xb,0x4c,0x57,0xe1,0x14,0x15,0xa0,0x7d,0xc0,0x36,0x7f,0xda,0xa6,0x2b,0xb8, - 0xb9,0x7,0x5e,0x67,0xf4,0xf7,0x7e,0x70,0xb,0xa4,0x8e,0xa0,0x4,0x4c,0xcb,0x12, - 0xae,0xf9,0x10,0x9e,0x0,0xe6,0x65,0x49,0x50,0x2,0x52,0x28,0x4b,0xc2,0x12,0xe0, - 0xd5,0x2,0xec,0xcb,0x92,0xb0,0x4,0x24,0x50,0x96,0x90,0x58,0x40,0x6c,0x8,0xa6, - 0x50,0x96,0xd0,0x28,0xc0,0xa,0xe,0x41,0xee,0x65,0x49,0xf0,0x3d,0x80,0x7b,0x59, - 0x42,0xb2,0xa,0x73,0x2e,0x4b,0x68,0x2c,0xc0,0xb8,0x2c,0x21,0x5b,0x85,0xb5,0x2c, - 0xd9,0xa5,0x42,0xe4,0x27,0x6c,0x2a,0x4c,0x8e,0x8f,0x80,0xdb,0x4b,0xe0,0xe9,0x19, - 0xb8,0xb8,0x2,0x16,0xef,0x61,0xb,0xf,0x76,0x85,0x88,0x73,0x40,0xb3,0xe4,0x63, - 0xb,0x7a,0x2,0xda,0xf1,0x40,0xda,0xdf,0x93,0x48,0xc0,0x44,0x1,0x1c,0x96,0x23, - 0x52,0x2,0x9a,0xe5,0xa0,0x80,0x61,0x37,0xe0,0x70,0x20,0x91,0x12,0x50,0x16,0x5f, - 0x6a,0xb2,0x5c,0x68,0x6,0x7c,0x5a,0xc0,0xa,0xcd,0x0,0xe7,0x80,0xb2,0x94,0x4a, - 0xc0,0x90,0x1,0x5c,0x2e,0xc4,0x38,0x53,0xa0,0xe9,0x15,0x20,0x77,0xf,0x18,0x6a, - 0x32,0xe,0x7,0x12,0x39,0x1,0xab,0xd3,0xd8,0x7b,0x1e,0x19,0x90,0x51,0xbf,0xb0, - 0xae,0xeb,0xb5,0x77,0x42,0x55,0x55,0xd9,0xce,0x2b,0x20,0xc6,0x47,0xb2,0x22,0x80, - 0x1b,0x9,0xd1,0x72,0x98,0xb,0x9,0x51,0x7,0x11,0x7,0x12,0xa2,0x4f,0x62,0x6e, - 0x99,0x10,0xd,0x9b,0xa6,0x83,0x42,0xa1,0x50,0x28,0x14,0x8a,0x20,0xf8,0x0,0x79, - 0xcb,0xc6,0x72,0x46,0x80,0x62,0xfc,0x0,0x0,0x0,0x0,0x49,0x45,0x4e,0x44,0xae, - 0x42,0x60,0x82, - // /home/markus/alpharesearchs-robocut/images/cap-red.png - 0x0,0x0,0x2,0x88, - 0x89, - 0x50,0x4e,0x47,0xd,0xa,0x1a,0xa,0x0,0x0,0x0,0xd,0x49,0x48,0x44,0x52,0x0, - 0x0,0x0,0x40,0x0,0x0,0x0,0x40,0x8,0x6,0x0,0x0,0x0,0xaa,0x69,0x71,0xde, - 0x0,0x0,0x0,0x1,0x73,0x52,0x47,0x42,0x0,0xae,0xce,0x1c,0xe9,0x0,0x0,0x0, - 0x6,0x62,0x4b,0x47,0x44,0x0,0xff,0x0,0xff,0x0,0xff,0xa0,0xbd,0xa7,0x93,0x0, - 0x0,0x0,0x9,0x70,0x48,0x59,0x73,0x0,0x0,0xb,0x13,0x0,0x0,0xb,0x13,0x1, - 0x0,0x9a,0x9c,0x18,0x0,0x0,0x0,0x7,0x74,0x49,0x4d,0x45,0x7,0xda,0xc,0x4, - 0x11,0x3b,0x1e,0xee,0xba,0xf4,0xa3,0x0,0x0,0x0,0x7f,0x74,0x45,0x58,0x74,0x43, - 0x6f,0x6d,0x6d,0x65,0x6e,0x74,0x0,0x54,0x68,0x69,0x73,0x20,0x64,0x72,0x61,0x77, - 0x69,0x6e,0x67,0x20,0x69,0x73,0x3a,0xa,0xa,0x20,0x20,0x20,0x20,0x43,0x6f,0x70, - 0x79,0x72,0x69,0x67,0x68,0x74,0x20,0xa9,0x20,0x32,0x30,0x31,0x30,0x20,0x4d,0x61, - 0x72,0x6b,0x75,0x73,0x20,0x53,0x63,0x68,0x75,0x6c,0x7a,0x20,0x3c,0x73,0x63,0x68, - 0x75,0x6c,0x7a,0x40,0x61,0x6c,0x70,0x68,0x61,0x72,0x65,0x73,0x65,0x61,0x72,0x63, - 0x68,0x2e,0x64,0x65,0x3e,0xa,0xa,0x61,0x6e,0x64,0x20,0x69,0x73,0x20,0x6c,0x69, - 0x63,0x65,0x6e,0x73,0x65,0x64,0x20,0x75,0x6e,0x64,0x65,0x72,0x20,0x74,0x68,0x65, - 0x20,0x47,0x50,0x4c,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x33,0xf1,0x81, - 0xf2,0x77,0x0,0x0,0x1,0x7d,0x49,0x44,0x41,0x54,0x78,0xda,0xed,0x58,0x31,0x8e, - 0xc2,0x30,0x10,0x9c,0x58,0x96,0x45,0xcb,0x7f,0x78,0x47,0x1e,0x41,0x49,0xc1,0x23, - 0x28,0x28,0x79,0x44,0x1e,0x40,0xcd,0x53,0x28,0xe8,0x69,0x91,0x65,0x85,0x2b,0x22, - 0xeb,0x52,0x0,0x77,0xe2,0xce,0xeb,0x31,0xbb,0x23,0xb9,0x8a,0xe2,0xc8,0x93,0x99, - 0x5d,0xef,0x0,0x6,0x83,0xc1,0xa0,0x18,0xdd,0xb3,0x7,0xf7,0xe5,0xf2,0xfe,0xab, - 0x1d,0xd6,0x6b,0x60,0xb3,0x1,0x8e,0x47,0x60,0xb7,0x3,0x2e,0x17,0xce,0x83,0x5e, - 0xaf,0xf,0xcf,0xea,0xfe,0xbc,0x73,0x4a,0xd3,0x72,0xe,0x8,0xa1,0x39,0x5,0xfc, - 0x1f,0x1,0xde,0x4f,0x4b,0x1d,0x1,0xe3,0x38,0x2d,0xe7,0x14,0x13,0x90,0x2d,0xe0, - 0x9c,0x62,0xb,0x84,0xa0,0x54,0x1,0x29,0x7d,0x5b,0x40,0xa5,0x2,0xb2,0x5,0xd4, - 0x16,0xc1,0xb9,0x2,0x54,0x17,0x41,0xef,0x15,0x17,0x41,0x53,0x80,0xb5,0xc1,0xa9, - 0xd,0xaa,0xb7,0x80,0xca,0x59,0x60,0x7e,0x15,0x6e,0x50,0x1,0x96,0x7,0xbc,0xf3, - 0xd2,0x5b,0x59,0xc1,0x7e,0xf,0x9c,0xcf,0xe2,0xf3,0x7e,0x79,0xb,0x34,0x8e,0xb2, - 0x4,0xcc,0xc3,0x12,0xd2,0xfa,0x20,0x43,0x0,0xf1,0x9c,0x50,0x96,0x80,0x6,0xc2, - 0x92,0xf2,0x4,0x98,0x5,0xb8,0xc3,0x92,0xf2,0x4,0x90,0x5f,0x92,0x64,0x2c,0xa0, - 0xb6,0x8,0x36,0x30,0x2a,0xcb,0x29,0x40,0x6d,0x11,0x34,0x5,0x58,0x1b,0xa4,0xe, - 0x4b,0xe4,0x2c,0x40,0x1a,0x96,0xc8,0x5d,0x85,0x2d,0x2c,0xf9,0xa0,0x40,0xe4,0x27, - 0xbc,0xc,0x4c,0x56,0x2b,0xe0,0x70,0x0,0x4e,0x27,0x60,0xbb,0x5,0x6e,0xb7,0xa2, - 0x81,0x7,0x5f,0x20,0x92,0x12,0x10,0x23,0x8d,0x2d,0xea,0x10,0x90,0x3b,0xc3,0x62, - 0xa1,0x94,0x80,0xac,0x0,0x82,0xcb,0x91,0x2c,0x1,0x31,0xd2,0x8d,0xc8,0xb2,0x4, - 0x84,0x40,0x17,0x93,0x99,0x5,0xaa,0x16,0x41,0xd5,0x4,0xa8,0x56,0x40,0x8c,0x34, - 0x3,0x52,0x3d,0x5,0x78,0x4f,0x31,0x20,0xc9,0x13,0x90,0xff,0xfc,0x38,0x52,0x58, - 0xa0,0x93,0xfe,0xe0,0x30,0xc,0x4f,0xe7,0x84,0xbe,0xef,0xbb,0x8f,0x57,0x40,0x8d, - 0x43,0x72,0x59,0x80,0x8c,0x84,0x6a,0x65,0x98,0x85,0x84,0xaa,0x7d,0x88,0x81,0x84, - 0xea,0x8d,0x98,0xad,0x26,0x54,0xc3,0xab,0xee,0x60,0x30,0x18,0xc,0x6,0x83,0xa1, - 0x8,0xbe,0x0,0xd0,0x29,0xc6,0x73,0x89,0x90,0x11,0x6f,0x0,0x0,0x0,0x0,0x49, - 0x45,0x4e,0x44,0xae,0x42,0x60,0x82, - -}; - -static const unsigned char qt_resource_name[] = { - // images - 0x0,0x6, - 0x7,0x3,0x7d,0xc3, - 0x0,0x69, - 0x0,0x6d,0x0,0x61,0x0,0x67,0x0,0x65,0x0,0x73, - // cap-yellow.png - 0x0,0xe, - 0x3,0x3,0xa5,0x47, - 0x0,0x63, - 0x0,0x61,0x0,0x70,0x0,0x2d,0x0,0x79,0x0,0x65,0x0,0x6c,0x0,0x6c,0x0,0x6f,0x0,0x77,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, - // cap-pen.png - 0x0,0xb, - 0x6,0x92,0x51,0xc7, - 0x0,0x63, - 0x0,0x61,0x0,0x70,0x0,0x2d,0x0,0x70,0x0,0x65,0x0,0x6e,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, - // icon.png - 0x0,0x8, - 0xa,0x61,0x5a,0xa7, - 0x0,0x69, - 0x0,0x63,0x0,0x6f,0x0,0x6e,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, - // cap-blue.png - 0x0,0xc, - 0xe,0x88,0x30,0x67, - 0x0,0x63, - 0x0,0x61,0x0,0x70,0x0,0x2d,0x0,0x62,0x0,0x6c,0x0,0x75,0x0,0x65,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, - // cap-red.png - 0x0,0xb, - 0x8,0x64,0x51,0xc7, - 0x0,0x63, - 0x0,0x61,0x0,0x70,0x0,0x2d,0x0,0x72,0x0,0x65,0x0,0x64,0x0,0x2e,0x0,0x70,0x0,0x6e,0x0,0x67, - -}; - -static const unsigned char qt_resource_struct[] = { - // : - 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x1, - // :/images - 0x0,0x0,0x0,0x0,0x0,0x2,0x0,0x0,0x0,0x5,0x0,0x0,0x0,0x2, - // :/images/cap-yellow.png - 0x0,0x0,0x0,0x12,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x0,0x0, - // :/images/cap-pen.png - 0x0,0x0,0x0,0x34,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x2,0x77, - // :/images/cap-red.png - 0x0,0x0,0x0,0x84,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x9,0x4b, - // :/images/icon.png - 0x0,0x0,0x0,0x50,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x5,0x6a, - // :/images/cap-blue.png - 0x0,0x0,0x0,0x66,0x0,0x0,0x0,0x0,0x0,0x1,0x0,0x0,0x6,0x83, - -}; - -QT_BEGIN_NAMESPACE - -extern Q_CORE_EXPORT bool qRegisterResourceData - (int, const unsigned char *, const unsigned char *, const unsigned char *); - -extern Q_CORE_EXPORT bool qUnregisterResourceData - (int, const unsigned char *, const unsigned char *, const unsigned char *); - -QT_END_NAMESPACE - - -int QT_MANGLE_NAMESPACE(qInitResources_resources)() -{ - QT_PREPEND_NAMESPACE(qRegisterResourceData) - (0x01, qt_resource_struct, qt_resource_name, qt_resource_data); - return 1; -} - -Q_CONSTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qInitResources_resources)) - -int QT_MANGLE_NAMESPACE(qCleanupResources_resources)() -{ - QT_PREPEND_NAMESPACE(qUnregisterResourceData) - (0x01, qt_resource_struct, qt_resource_name, qt_resource_data); - return 1; -} - -Q_DESTRUCTOR_FUNCTION(QT_MANGLE_NAMESPACE(qCleanupResources_resources)) - diff -Nru robocut-1.0.6/Robocut.pro robocut-1.0.8/Robocut.pro --- robocut-1.0.6/Robocut.pro 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/Robocut.pro 2011-08-13 20:35:08.000000000 +0000 @@ -2,14 +2,15 @@ # Project created by QtCreator 2010-10-03T18:21:30 # ------------------------------------------------- TARGET = robocut -VERSION = _1.0.6 +VERSION = 1.0.8 TEMPLATE = app INSTALLS += icon \ target target.path = /usr/bin icon.files += ./images/robocut.xpm icon.path = /usr/share/pixmaps/ - +QMAKE_EXTRA_TARGETS += release tarball + SOURCES += main.cpp \ MainWindow.cpp \ Plotter.cpp \ @@ -42,18 +43,23 @@ RESOURCES += \ resources.qrc + +release.depends = tarball -QMAKE_COPY += \ - readme.txt \ - install.txt \ - changelog \ - images/cap-blue.png \ - images/cap-pen.png \ - images/cap-red.png \ - images/cap-yellow.png \ - images/icon.png \ - images/robocut.xpm \ - images/robocut.xcf \ - images/cap.xcf \ - images/pen.xcf \ - examples/letter_reg-marks.svg +tarball.target = $${TARGET}-$${VERSION}.tar.gz +tarball.commands = \ + $(DEL_FILE) -r $${TARGET}-$${VERSION} ; \ + $(MKDIR) $${TARGET}-$${VERSION} ; \ + $(COPY_DIR) * $${TARGET}-$${VERSION}/ ; \ + $(DEL_FILE) $${TARGET}-$${VERSION}/*.pro.user \ + $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION}.tar.gz \ + $(DEL_FILE) -r $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION} \ + $${TARGET}-$${VERSION}/autodist.sh ; \ + $(DEL_FILE) -r $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION} \ + $${TARGET}-$${VERSION}/umbrello_stuff.xmi ; \ + $(DEL_FILE) -r $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION} \ + $${TARGET}-$${VERSION}/robocut ; \ + $(DEL_FILE) -r $${TARGET}-$${VERSION}/$${TARGET}-$${VERSION} \ + $${TARGET}-$${VERSION}/Makefile ; \ + tar -cz --exclude=.svn --exclude=*.tar.gz -f $$tarball.target $${TARGET}-$${VERSION} ; \ + $(DEL_FILE) -r $${TARGET}-$${VERSION} diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/common/g++.conf robocut-1.0.8/usr/share/qt4/mkspecs/common/g++.conf --- robocut-1.0.6/usr/share/qt4/mkspecs/common/g++.conf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/common/g++.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -# -# qmake configuration for common gcc -# - -QMAKE_CC = gcc -QMAKE_CFLAGS += -pipe -QMAKE_CFLAGS_DEPS += -M -QMAKE_CFLAGS_WARN_ON += -Wall -W -QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O2 -QMAKE_CFLAGS_DEBUG += -g -QMAKE_CFLAGS_SHLIB += -fPIC -QMAKE_CFLAGS_STATIC_LIB += -fPIC -QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses -QMAKE_CFLAGS_HIDESYMS += -fvisibility=hidden -QMAKE_CFLAGS_PRECOMPILE += -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} -QMAKE_CFLAGS_USE_PRECOMPILE += -include ${QMAKE_PCH_OUTPUT_BASE} - -QMAKE_CXX = g++ -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS -QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS -QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE += $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS_DEBUG += $$QMAKE_CFLAGS_DEBUG -QMAKE_CXXFLAGS_SHLIB += $$QMAKE_CFLAGS_SHLIB -QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB -QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC -QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -fvisibility-inlines-hidden -QMAKE_CXXFLAGS_PRECOMPILE += -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} -QMAKE_CXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE - -QMAKE_LINK = g++ -QMAKE_LINK_SHLIB = g++ -QMAKE_LINK_C = gcc -QMAKE_LINK_C_SHLIB = gcc -QMAKE_LFLAGS += -QMAKE_LFLAGS_RELEASE += -Wl,-O1 -QMAKE_LFLAGS_DEBUG += -QMAKE_LFLAGS_APP += -QMAKE_LFLAGS_SHLIB += -shared -QMAKE_LFLAGS_PLUGIN += $$QMAKE_LFLAGS_SHLIB -QMAKE_LFLAGS_SONAME += -Wl,-soname, -QMAKE_LFLAGS_THREAD += -QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined -QMAKE_LFLAGS_RPATH = -Wl,-rpath, - -QMAKE_PCH_OUTPUT_EXT = .gch - -# -Bsymbolic-functions (ld) support -QMAKE_LFLAGS_BSYMBOLIC_FUNC = -Wl,-Bsymbolic-functions -QMAKE_LFLAGS_DYNAMIC_LIST = -Wl,--dynamic-list, diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/common/linux.conf robocut-1.0.8/usr/share/qt4/mkspecs/common/linux.conf --- robocut-1.0.6/usr/share/qt4/mkspecs/common/linux.conf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/common/linux.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -# -# qmake configuration for common linux -# - -QMAKE_CFLAGS_THREAD += -D_REENTRANT -QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD - -QMAKE_INCDIR = -QMAKE_LIBDIR = -QMAKE_INCDIR_X11 = /usr/X11R6/include -QMAKE_LIBDIR_X11 = /usr/X11R6/lib -QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS] -QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS] -QMAKE_INCDIR_OPENGL = /usr/X11R6/include -QMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL -QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL -QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL -QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL -QMAKE_INCDIR_EGL = -QMAKE_LIBDIR_EGL = -QMAKE_INCDIR_OPENVG = -QMAKE_LIBDIR_OPENVG = - -QMAKE_LIBS = -QMAKE_LIBS_DYNLOAD = -ldl -QMAKE_LIBS_X11 = -lXext -lX11 -lm -QMAKE_LIBS_X11SM = -lSM -lICE -QMAKE_LIBS_NIS = -lnsl -QMAKE_LIBS_EGL = -lEGL -QMAKE_LIBS_OPENGL = -lGLU -lGL -QMAKE_LIBS_OPENGL_QT = -lGL -QMAKE_LIBS_OPENGL_ES1 = -lGLES_CM -QMAKE_LIBS_OPENGL_ES2 = -lGLESv2 -QMAKE_LIBS_OPENVG = -lOpenVG -QMAKE_LIBS_THREAD = -lpthread - -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc-qt4 -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic-qt4 - -QMAKE_AR = ar cqs -QMAKE_OBJCOPY = objcopy -QMAKE_RANLIB = - -QMAKE_TAR = tar -cf -QMAKE_GZIP = gzip -9f - -QMAKE_COPY = cp -f -QMAKE_COPY_FILE = $(COPY) -QMAKE_COPY_DIR = $(COPY) -r -QMAKE_MOVE = mv -f -QMAKE_DEL_FILE = rm -f -QMAKE_DEL_DIR = rmdir -QMAKE_STRIP = strip -QMAKE_STRIPFLAGS_LIB += --strip-unneeded -QMAKE_CHK_DIR_EXISTS = test -d -QMAKE_MKDIR = mkdir -p -QMAKE_INSTALL_FILE = install -m 644 -p -QMAKE_INSTALL_PROGRAM = install -m 755 -p - -include(unix.conf) diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/common/unix.conf robocut-1.0.8/usr/share/qt4/mkspecs/common/unix.conf --- robocut-1.0.6/usr/share/qt4/mkspecs/common/unix.conf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/common/unix.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -# -# qmake configuration for common unix -# - -QMAKE_LEX = flex -QMAKE_LEXFLAGS += -QMAKE_YACC = yacc -QMAKE_YACCFLAGS += -d -QMAKE_YACCFLAGS_MANGLE += -p $base -b $base -QMAKE_YACC_HEADER = $base.tab.h -QMAKE_YACC_SOURCE = $base.tab.c -QMAKE_PREFIX_SHLIB = lib -QMAKE_PREFIX_STATICLIB = lib -QMAKE_EXTENSION_STATICLIB = a diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/default_post.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/default_post.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/default_post.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/default_post.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,25 +0,0 @@ -CONFIG(debug, debug|release):load(debug) -else:load(release) -debug_and_release:load(debug_and_release) -incredibuild_xge { - CONFIG -= incredibuild_xge - CONFIG = incredibuild_xge $$CONFIG -} - -QMAKE_INCDIR += $$QMAKE_INCDIR_POST -QMAKE_LIBDIR += $$QMAKE_LIBDIR_POST - -# Let every project have a standard GNU `check' target -!contains(QMAKE_EXTRA_TARGETS, check) { - # `make check' should iterate through all subdirs - contains(TEMPLATE, subdirs) { - check.CONFIG = recursive - check.recurse = $$SUBDIRS - check.recurse_target = check - } - # `make check' should imply building the project - else { - check.depends = first - } - QMAKE_EXTRA_TARGETS += check -} diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/default_pre.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/default_pre.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/default_pre.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/default_pre.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -load(exclusive_builds) -### Qt 5: remove "uic" and "resources" - or add "qt" -CONFIG = lex yacc warn_on debug uic resources $$CONFIG diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/exclusive_builds.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/exclusive_builds.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/exclusive_builds.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/exclusive_builds.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,100 +0,0 @@ -# fixExclusiveOutputDirs(1config, 2config) -# Change all output paths that references 2config to have the string 1config in them -defineTest(fixExclusiveOutputDirs) { - unset(firstBuild) - unset(secondBuild) - unset(appendFirstBuild) - firstBuild = $$1 - secondBuild = $$2 - count(ARGS, 2, greaterThan):isEqual($$list($$lower($$3)), false):appendFirstBuild = false - else:appendFirstBuild = true - - isEmpty(QMAKE_DIR_REPLACE):QMAKE_DIR_REPLACE += OBJECTS_DIR MOC_DIR RCC_DIR - lessThan(firstBuild, $$secondBuild):eval($${firstBuild}_and_$${secondBuild}_target:QMAKE_DIR_REPLACE += DESTDIR) - else:eval($${secondBuild}_and_$${firstBuild}_target:QMAKE_DIR_REPLACE += DESTDIR) - for(fix, QMAKE_DIR_REPLACE) { - isEmpty($$fix)|isEqual($$fix, .) { - eval($$fix = $${firstBuild}) - } else:contains($$list($$first($$fix)), .*$${secondBuild}.*) { - eval($$fix ~= s/$${secondBuild}/$${firstBuild}/gi) - } else:isEqual(appendFirstBuild, true):!contains($$list($$first($$fix)), .*$${firstBuild}.*) { - contains($$list($${first($$fix)}), .*/$):eval($$fix = $${first($$fix)}$${firstBuild}) - else:eval($$fix = $${first($$fix)}-$${firstBuild}) - } - export($$fix) - } - return(true) -} - -# addExclusiveBuilds(1config, 1name, 2config, 2name) -# Adds two BUILDS which are exclusive to each other. -defineTest(addExclusiveBuilds) { - unset(firstBuild) - unset(firstBuildName) - unset(secondBuild) - unset(secondBuildName) - - firstBuild = $$1 - firstBuildName = $$2 - secondBuild = $$3 - secondBuildName = $$4 - - contains(TEMPLATE, subdirs) { - eval(sub_$${firstBuildName}.target = $$firstBuild) - export(sub_$${firstBuildName}.target) - eval(sub_$${firstBuildName}.CONFIG = recursive) - export(sub_$${firstBuildName}.CONFIG) - eval(sub_$${secondBuildName}.target = $$secondBuild) - export(sub_$${secondBuildName}.target) - eval(sub_$${secondBuildName}.CONFIG = recursive) - export(sub_$${secondBuildName}.CONFIG) - QMAKE_EXTRA_TARGETS += sub_$${firstBuildName} sub_$${secondBuildName} - export(QMAKE_EXTRA_TARGETS) - } else:!build_pass { - first_BUILDS = - second_BUILDS = - suffix_BUILDS = Build - - isEmpty(BUILDS): BUILDPERMUTATIONS = $$suffix_BUILDS - else: BUILDPERMUTATIONS = $$BUILDS - - for(permutation, BUILDPERMUTATIONS) { - permutation ~= s/$${suffix_BUILDS}$// - isEmpty(permutation): permutationName = - else: permutationName = -$$permutation - # Makefile target rule - eval($${firstBuildName}$${permutation}.target = $${firstBuild}$$lower($${permutationName})) - export($${firstBuildName}$${permutation}.target) - # IDE name - eval($${firstBuildName}$${permutation}.name = $${firstBuildName}$${permutationName}) - export($${firstBuildName}$${permutation}.name) - # prl import CONFIG option - eval($${firstBuildName}$${permutation}.PRL_CONFIG = $${firstBuild}$${permutation}) - export($${firstBuildName}$${permutation}.PRL_CONFIG) - # Individual CONFIG option - eval($${firstBuildName}$${permutation}.CONFIG = $${firstBuild} $${firstBuildName}Build $$eval($${permutation}.CONFIG)) - export($${firstBuildName}$${permutation}.CONFIG) - - eval($${secondBuildName}$${permutation}.target = $${secondBuild}$$lower($${permutationName})) - export($${secondBuildName}$${permutation}.target) - eval($${secondBuildName}$${permutation}.name = $${secondBuildName}$${permutationName}) - export($${secondBuildName}$${permutation}.name) - eval($${secondBuildName}$${permutation}.PRL_CONFIG = $${secondBuild}$${permutation}) - export($${secondBuildName}$${permutation}.PRL_CONFIG) - eval($${secondBuildName}$${permutation}.CONFIG = $${secondBuild} $${secondBuildName}Build $$eval($${permutation}.CONFIG)) - export($${secondBuildName}$${permutation}.CONFIG) - - first_BUILDS += $${firstBuildName}$${permutation} - second_BUILDS += $${secondBuildName}$${permutation} - } - - # A mutual exclusive block. - CONFIG($${firstBuild}, $${firstBuild}|$${secondBuild}): BUILDS = $$first_BUILDS $$second_BUILDS - else: BUILDS = $$second_BUILDS $$first_BUILDS - export(BUILDS) - } else { - eval($${firstBuildName}Build:fixExclusiveOutputDirs($$firstBuild, $$secondBuild, false)) - eval($${secondBuildName}Build:fixExclusiveOutputDirs($$secondBuild, $$firstBuild, false)) - } - return(true) -} diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/include_source_dir.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/include_source_dir.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/include_source_dir.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/include_source_dir.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -!equals(_PRO_FILE_PWD_, $$OUT_PWD):INCLUDEPATH *= . diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/lex.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/lex.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/lex.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/lex.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -# -# Lex extra-compiler for handling files specified in the LEXSOURCES variable -# - -{ - lex.name = Lex ${QMAKE_FILE_IN} - lex.input = LEXSOURCES - lex_included { - lex.CONFIG += no_link - } else { - lex.variable_out = GENERATED_SOURCES - } - isEmpty(QMAKE_LEXFLAGS_MANGLE):QMAKE_LEXFLAGS_MANGLE = -P${QMAKE_FILE_BASE} - QMAKE_LEXEXTRAFLAGS = $$QMAKE_LEXFLAGS - !yacc_no_name_mangle:QMAKE_LEXEXTRAFLAGS += $$QMAKE_LEXFLAGS_MANGLE - - lex.commands = $$QMAKE_LEX $$QMAKE_LEXEXTRAFLAGS ${QMAKE_FILE_IN}$$escape_expand(\\n\\t) \ - $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) \ - $$QMAKE_MOVE lex.${QMAKE_FILE_BASE}.c $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) - lex.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_lex$${first(QMAKE_EXT_CPP)} - - silent:lex.commands = @echo Lex ${QMAKE_FILE_IN} && $$lex.commands - QMAKE_EXTRA_COMPILERS += lex -} diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/moc.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/moc.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/moc.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/moc.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ - -#global defaults -qtPrepareTool(QMAKE_MOC, moc-qt4) -isEmpty(MOC_DIR):MOC_DIR = . -isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_ -isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc - -# On Windows, put the includes into a .inc file which moc will read, if the project -# has too many includes. We do this to overcome a command-line limit on Win < XP -INCLUDETEMP= -WIN_INCLUDETEMP= -win32:count($$list($$INCLUDEPATH), 40, >) { - INCLUDETEMP = $$MOC_DIR/mocinclude.tmp - - WIN_INCLUDETEMP=$$INCLUDETEMP - - EOC = $$escape_expand(\\n\\t) - - if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) { - # the VCPROJ generator will replace the \r\h with the coded \r\n: - # No other generator understands the \h - if(win32-msvc2*|wince*msvc*): EOC = $$escape_expand(\\r\\h) - else: EOC = $$escape_expand(\\\\\\n\\t) - } - - unset(INCFILELIST) - RET = - for(incfile, $$list($$INCLUDEPATH)) { - INCFILELIST = -I$$incfile - isEmpty(RET): RET += @echo $$INCFILELIST> $$WIN_INCLUDETEMP $$EOC - else: RET += @echo $$INCFILELIST>> $$WIN_INCLUDETEMP $$EOC - } - !isEmpty(INCFILELIST):RET += @echo $$INCFILELIST>> $$WIN_INCLUDETEMP $$EOC - - build_pass|isEmpty(BUILDS) { - mocinclude.target = $$INCLUDETEMP - mocinclude.commands = $$RET - QMAKE_EXTRA_TARGETS += mocinclude - } -} - -defineReplace(mocCmd) { - !isEmpty(WIN_INCLUDETEMP) { - RET = - if(contains(TEMPLATE, "vc.*")|contains(TEMPLATE_PREFIX, "vc")) { - RET += $$mocinclude.commands - } - RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2 - return($$RET) - } - return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$1 -o $$2) -} - -#moc headers -moc_header.CONFIG = moc_verify -moc_header.dependency_type = TYPE_C -moc_header.commands = ${QMAKE_FUNC_mocCmd} -moc_header.output = $$MOC_DIR/$${QMAKE_H_MOD_MOC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} -moc_header.input = HEADERS -moc_header.variable_out = SOURCES -moc_header.name = MOC ${QMAKE_FILE_IN} -if(!contains(TEMPLATE, "vc.*"):!contains(TEMPLATE_PREFIX, "vc")) { - !isEmpty(INCLUDETEMP):moc_header.depends += $$INCLUDETEMP -} -silent:moc_header.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_header.commands -QMAKE_EXTRA_COMPILERS += moc_header -INCREDIBUILD_XGE += moc_header - -#moc sources -moc_source.CONFIG = no_link moc_verify -moc_source.dependency_type = TYPE_C -moc_source.commands = ${QMAKE_FUNC_mocCmd} -moc_source.output = $$MOC_DIR/$${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}$${QMAKE_EXT_CPP_MOC} -moc_source.input = SOURCES OBJECTIVE_SOURCES -moc_source.name = MOC ${QMAKE_FILE_IN} -if(!contains(TEMPLATE, "vc.*"):!contains(TEMPLATE_PREFIX, "vc")) { - !isEmpty(INCLUDETEMP):moc_source.depends += $$INCLUDETEMP -} -silent:moc_source.commands = @echo moc ${QMAKE_FILE_IN} && $$moc_source.commands -QMAKE_EXTRA_COMPILERS += moc_source -INCREDIBUILD_XGE += moc_source - -#make sure we can include these files -moc_dir_short = $$MOC_DIR -contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/, -contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR -else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR - -# Backwards compatibility: Make shadow builds with default MOC_DIR work -# if the user did not add the source dir explicitly. -equals(MOC_DIR, .) { - CONFIG -= include_source_dir - CONFIG = include_source_dir $$CONFIG -} - -#auto depend on moc -unix:!symbian:!no_mocdepend { - moc_source.depends += $$first(QMAKE_MOC) - moc_header.depends += $$first(QMAKE_MOC) - !contains(TARGET, moc) { #auto build moc - isEmpty(QMAKE_MOC_SRC):QMAKE_MOC_SRC = "$(QTDIR)/src/tools/moc" - make_moc.target = $$first(QMAKE_MOC) - make_moc.commands = (cd $$QMAKE_MOC_SRC && $(MAKE)) - QMAKE_EXTRA_TARGETS += make_moc - } -} - -#generate a mocclean -build_pass|isEmpty(BUILDS):mocclean.depends = compiler_moc_header_clean compiler_moc_source_clean -else:mocclean.CONFIG += recursive -QMAKE_EXTRA_TARGETS += mocclean - -#generate a mocables -build_pass|isEmpty(BUILDS):mocables.depends = compiler_moc_header_make_all compiler_moc_source_make_all -else:mocables.CONFIG += recursive -QMAKE_EXTRA_TARGETS += mocables diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/qt_config.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/qt_config.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/qt_config.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/qt_config.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -exists($$_QMAKE_CACHE_):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QMAKE_QT_CONFIG) -isEmpty(QMAKE_QT_CONFIG)|!exists($$QMAKE_QT_CONFIG) { - !isEmpty(QT_BUILD_TREE):QMAKE_QT_CONFIG = $$QT_BUILD_TREE/mkspecs/qconfig.pri - else:exists($$_QMAKE_CACHE_):infile($$_QMAKE_CACHE_, QT_BUILD_TREE):QMAKE_QT_CONFIG = $$fromfile($$_QMAKE_CACHE_, QT_BUILD_TREE)/mkspecs/qconfig.pri - else:exists($$[QT_INSTALL_DATA]/mkspecs/qconfig.pri):QMAKE_QT_CONFIG = $$[QT_INSTALL_DATA]/mkspecs/qconfig.pri -} -!exists($$QMAKE_QT_CONFIG)|!include($$QMAKE_QT_CONFIG, "", true) { - debug(1, "Cannot load qconfig.pri!") -} else { - debug(1, "Loaded .qconfig.pri from ($$QMAKE_QT_CONFIG)") - for(mod, $$list($$files($$dirname(QMAKE_QT_CONFIG)/modules/qt_*.pri))):include($$mod) -} - -load(qt_functions) - diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/qt_functions.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/qt_functions.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/qt_functions.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/qt_functions.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,92 +0,0 @@ -defineReplace(qtLibraryTarget) { - unset(LIBRARY_NAME) - LIBRARY_NAME = $$1 - mac:!static:contains(QT_CONFIG, qt_framework) { - QMAKE_FRAMEWORK_BUNDLE_NAME = $$LIBRARY_NAME - export(QMAKE_FRAMEWORK_BUNDLE_NAME) - } - contains(TEMPLATE, .*lib):CONFIG(debug, debug|release) { - !debug_and_release|build_pass { - mac:RET = $$member(LIBRARY_NAME, 0)_debug - else:win32:RET = $$member(LIBRARY_NAME, 0)d - } - } - isEmpty(RET):RET = $$LIBRARY_NAME - return($$RET) -} - -defineTest(qtAddLibrary) { - INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$1 - INCLUDEPATH = $$QMAKE_INCDIR_QT/$$1 $$INCLUDEPATH - - LIB_NAME = $$1 - unset(LINKAGE) - mac { - CONFIG(qt_framework, qt_framework|qt_no_framework) { #forced - QMAKE_FRAMEWORKPATH *= $${QMAKE_LIBDIR_QT} - FRAMEWORK_INCLUDE = $$QMAKE_LIBDIR_QT/$${LIB_NAME}.framework/Headers - !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { - INCLUDEPATH -= $$FRAMEWORK_INCLUDE - INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH - } - LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX} - } else:!qt_no_framework { #detection - for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { - exists($${frmwrk_dir}/$${LIB_NAME}.framework) { - QMAKE_FRAMEWORKPATH *= $${frmwrk_dir} - FRAMEWORK_INCLUDE = $$frmwrk_dir/$${LIB_NAME}.framework/Headers - !qt_no_framework_direct_includes:exists($$FRAMEWORK_INCLUDE) { - INCLUDEPATH -= $$FRAMEWORK_INCLUDE - INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH - } - LINKAGE = -framework $${LIB_NAME} - break() - } - } - } - } - symbian { - isEqual(LIB_NAME, QtGui) { - # Needed for #include because qs60mainapplication.h includes aknapp.h - INCLUDEPATH *= $$MW_LAYER_SYSTEMINCLUDE - } - isEqual(LIB_NAME, QtWebKit) { - # Needed for because relative inclusion problem in toolchain - INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtXmlPatterns - INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork - } - isEqual(LIB_NAME, QtXmlPatterns) { - # Needed for #include because relative inclusion problem in toolchain - INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtNetwork - } - } - isEmpty(LINKAGE) { - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d - mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug - } - isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} - } - !isEmpty(QMAKE_LSB) { - QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT - QMAKE_LFLAGS *= -L/opt/lsb/lib - QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}$${QT_LIBINFIX} - } - LIBS += $$LINKAGE - export(LIBS) - export(INCLUDEPATH) - export(QMAKE_FRAMEWORKPATH) - export(QMAKE_LFLAGS) - return(true) -} - -# variable, default -defineTest(qtPrepareTool) { - isEmpty($$1) { - !isEmpty(QT_BUILD_TREE):$$1 = $$QT_BUILD_TREE/bin/$$2 - else:$$1 = $$[QT_INSTALL_BINS]/$$2 - } - $$1 ~= s,[/\\\\],$$QMAKE_DIR_SEP, - contains(QMAKE_HOST.os, Windows):!contains($$1, .*\\.exe$):$$1 = $$eval($$1).exe - export($$1) -} diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/qt.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/qt.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/qt.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/qt.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,211 +0,0 @@ -CONFIG *= moc thread - -#handle defines -win32 { - qt_static:DEFINES += QT_NODLL - !contains(DEFINES, QT_NODLL) { - QT_ENV_DLL = $$(QT_DLL) - QT_ENV_NO_DLL = $$(QT_NODLL) - isEmpty(QT_ENV_NO_DLL) { - shared|!isEmpty(QT_ENV_DLL):DEFINES += QT_DLL - } - contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL):QMAKE_QT_DLL = 1 - } -} -CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG -no_keywords:DEFINES += QT_NO_KEYWORDS -plugin { #Qt plugins - static:DEFINES += QT_STATICPLUGIN - DEFINES += QT_PLUGIN - - # Triggers both on Qt being configured with -arch boundschecker, - # and if you qmake CONFIG+=boundchecker on your plugin project - boundschecker|contains(QT_CONFIG,boundschecker) { - # This option is added for plugins when Qt is configured for Boundschecker, - # since we want Boundschecker to not instrument the qt_plugin_query_verification_data - # function, as we call that function without the plugin's dependent DLLs, thus - # Boundscheckers instrumentation will fail. The function only returns a const char *, - # so no instrumentation is really needed on that function anyways. - QMAKE_CFLAGS += /nmignore:*:qt_plugin_query_verification_data - QMAKE_CXXFLAGS += /nmignore:*:qt_plugin_query_verification_data - } -} - -#handle modules -for(mod,$$list($$files($$[QMAKE_MKSPECS]/modules/qt_*.pri))):include($$mod) - -#handle includes -INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes -win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt - -# As order does matter for static libs, we reorder the QT variable here -TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core -for(QTLIB, $$list($$TMPLIBS)) { - contains(QT, $$QTLIB): QT_ORDERED += $$QTLIB -} - -QT_UNKNOWN = $$QT -QT_UNKNOWN -= $$QT_ORDERED -QT = $$QT_ORDERED -for(QTLIB, $$list($$QT_UNKNOWN)) { - !contains(TMPLIBS, $$QTLIB):message("Warning: unknown QT: $$QTLIB") -} - -QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN -for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) { - for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) { - qplugin_style = - !qt_debug:!qt_release { - CONFIG(debug, debug|release):qplugin_style = debug - else:qplugin_style = release - } else:CONFIG(qt_debug, qt_debug|qt_release) { - qplugin_style = debug - } else { - qplugin_style = release - } - - # Check if the plugin is known to Qt. We can use this to determine - # the plugin path. Unknown plugins must rely on the default link path. - ACCESSIBLEPLUGINS = qtaccessiblewidgets qtaccessiblecompatwidgets - CODECPLUGINS = qcncodecs qjpcodecs qkrcodecs qtwcodecs - DECORATIONPLUGINS = qdecorationdefault qdecorationwindows - GFXDRIVERPLUGINS = qgfxvnc qscreenvfb qgfxsnap qgfxvga16 qgfxmatrox qgfxvoodoo qgfxtransformed qgfxshadowfb - IMAGEPLUGINS = qgif qmng qjpeg qsvg - INPUTPLUGINS = qimsw-multi - MOUSEDRIVERPLUGINS = qtslibmousehandler - SQLPLUGINS = qsqldb2 qsqloci qsqltds qsqlodbc qsqlpsql qsqlibase qsqlmysql qsqlite2 qsqlite - PHONONPLUGINS = phonon_waveout phonon_ds9 - - ALLQTPLUGINS = $$ACCESSIBLEPLUGINS $$CODECPLUGINS $$DECORATIONPLUGINS $$GFXDRIVERPLUGINS $$IMAGEPLUGINS $$INPUTPLUGINS $$MOUSEDRIVERPLUGINS $$SQLPLUGINS $$PHONONPLUGINS - - QT_PLUGINPATH = - contains(ALLQTPLUGINS, $$QTPLUG) { - # Determine the plugin path - contains(ACCESSIBLEPLUGINS, $$QTPLUG): QT_PLUGINPATH = accessible - contains(CODECPLUGINS, $$QTPLUG): QT_PLUGINPATH = codecs - contains(DECORATIONPLUGINS, $$QTPLUG): QT_PLUGINPATH = decorations - contains(GFXDRIVERPLUGINS, $$QTPLUG): QT_PLUGINPATH = gfxdrivers - contains(IMAGEPLUGINS, $$QTPLUG): QT_PLUGINPATH = imageformats - contains(INPUTPLUGINS, $$QTPLUG): QT_PLUGINPATH = inputmethods - contains(MOUSEDRIVERPLUGINS, $$QTPLUG): QT_PLUGINPATH = mousedrivers - contains(SQLPLUGINS, $$QTPLUG): QT_PLUGINPATH = sqldrivers - contains(PHONONPLUGINS, $$QTPLUG): QT_PLUGINPATH = phonon_backend - } - - # Generate the plugin linker line - target_qt:isEqual(TARGET, QTPLUG) { - warning($$TARGET cannot have a QTPLUGIN of $$QTPLUG) - } else { - QT_LINKAGE = -l$${QTPLUG} - win32 { - CONFIG(debug, debug|release):QT_LINKAGE = -l$${QTPLUG}d - } else:mac { - isEqual(qplugin_style, debug):QT_LINKAGE = -l$${QTPLUG}_debug - } - } - - # Only link against plugin in static builds - isEqual(QT_CURRENT_VERIFY, QTPLUGIN): { - !isEmpty(QT_PLUGINPATH): LIBS *= -L$$[QT_INSTALL_PLUGINS]/$$QT_PLUGINPATH - LIBS += $$QT_LINKAGE - # if the plugin is linked statically there is no need to deploy it - DEPLOYMENT_PLUGIN -= $$QT_CURRENT_VERIFY - } - isEqual(QT_CURRENT_VERIFY, DEPLOYMENT_PLUGIN):shared:wince*: { - QT_ITEM = - CONFIG(debug, debug|release): QT_ITEM = $${QTPLUG}d4.dll - else: QT_ITEM = $${QTPLUG}4.dll - - eval(qt_additional_plugin_$${QTPLUG}.sources = $$[QT_INSTALL_PLUGINS]/$${QT_PLUGINPATH}/$${QT_ITEM}) - eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH}) - - DEPLOYMENT *= qt_additional_plugin_$${QTPLUG} - } - isEqual(QT_CURRENT_VERIFY, DEPLOYMENT_PLUGIN):shared:symbian: { - QT_ITEM = $${QTPLUG}.dll - - eval(qt_additional_plugin_$${QTPLUG}.sources = $${QT_ITEM}) - eval(qt_additional_plugin_$${QTPLUG}.path = $${QT_PLUGINPATH}) - - DEPLOYMENT *= qt_additional_plugin_$${QTPLUG} - } - } -} -#specific module settings -!isEmpty(QT_BUILD_TREE):QMAKE_LIBDIR = $$QT_BUILD_TREE/lib $$QMAKE_LIBDIR #as above, prepending prevents us from picking up "stale" libs -QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT -for(QTLIB, $$list($$lower($$unique(QT)))) { - unset(qlib_style) - !qt_debug:!qt_release { - CONFIG(debug, debug|release):qlib_style = debug - else:qlib_style = release - } else:CONFIG(qt_debug, qt_debug|qt_release) { - qlib_style = debug - } else { - qlib_style = release - } - - unset(qlib) - isEqual(QTLIB, gui):qlib = QtGui - else:isEqual(QTLIB, network):qlib = QtNetwork - else:isEqual(QTLIB, xml):qlib = QtXml - else:isEqual(QTLIB, xmlpatterns):qlib = QtXmlPatterns - else:isEqual(QTLIB, opengl):qlib = QtOpenGL - else:isEqual(QTLIB, openvg):qlib = QtOpenVG - else:isEqual(QTLIB, sql):qlib = QtSql - else:isEqual(QTLIB, core):qlib = QtCore - else:isEqual(QTLIB, canvas):qlib = QtCanvas - else:isEqual(QTLIB, qt3support):qlib = Qt3Support - else:isEqual(QTLIB, svg):qlib = QtSvg - else:isEqual(QTLIB, script):qlib = QtScript - else:isEqual(QTLIB, scripttools):qlib = QtScriptTools - else:isEqual(QTLIB, testlib):qlib = QtTest - else:isEqual(QTLIB, dbus):qlib = QtDBus - else:isEqual(QTLIB, phonon) { - qlib = phonon - INCLUDEPATH += $$QMAKE_INCDIR_QT/phonon_compat - - # The Helix backend requires this. Since we can't let a plugin set it, - # we bump the values for all Symbian Phonon plugins. - symbian:isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x040000 0x1600000 - - } else:isEqual(QTLIB, webkit) { - qlib = QtWebKit - aix-xlc { - # Flags recommended by IBM when using WebKit - QMAKE_LFLAGS -= -bmaxdata:0x80000000 - QMAKE_LFLAGS += -bmaxdata:0xD0000000/dsa - } - } else:isEqual(QTLIB, declarative):qlib = QtDeclarative - else:isEqual(QTLIB, multimedia):qlib = QtMultimedia - else:message("Unknown QT: $$QTLIB"):qlib = - !isEmpty(qlib) { - target_qt:isEqual(TARGET, qlib) { - warning($$TARGET cannot have a QT of $$QTLIB) - } else { - DEFINES *= $$upper(QT_$${QTLIB}_LIB) - isEqual(QTLIB, opengl):CONFIG += opengl - isEqual(QTLIB, openvg):CONFIG += openvg - isEqual(QTLIB, qt3support):DEFINES *= QT3_SUPPORT - isEqual(QTLIB, testlib):CONFIG += console - isEqual(QTLIB, dbus):CONFIG += dbusadaptors dbusinterfaces - - qtAddLibrary($$qlib) - } - } -} - -qt_compat { - !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us - INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt - DEFINES *= QT_COMPAT -} - -wince*:static:gui { - QTLIB += qmenu_wce.res -} - -!isEmpty(QT_NAMESPACE):DEFINES *= QT_NAMESPACE=$$QT_NAMESPACE -mac { - !isEmpty(QT_NAMESPACE_MAC_CRC):DEFINES *= QT_NAMESPACE_MAC_CRC=$$QT_NAMESPACE_MAC_CRC -} diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/release.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/release.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/release.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/release.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,7 +0,0 @@ -CONFIG -= debug -QMAKE_CFLAGS += $$QMAKE_CFLAGS_RELEASE -QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_RELEASE -QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_RELEASE -QMAKE_LFLAGS += $$QMAKE_LFLAGS_RELEASE -QMAKE_LIBFLAGS += $$QMAKE_LIBFLAGS_RELEASE -!debug_and_release:fix_output_dirs:fixExclusiveOutputDirs(release, debug) \ No newline at end of file diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/resources.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/resources.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/resources.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/resources.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf -qtPrepareTool(QMAKE_RCC, rcc) - -isEmpty(RCC_DIR):RCC_DIR = . -isEmpty(QMAKE_RESOURCE_PREFIX):QMAKE_RESOURCE_PREFIX = /tmp/ -isEmpty(QMAKE_MOD_RCC):QMAKE_MOD_RCC = qrc - -resource_combine { - rcc.CONFIG += combine - rcc.output = $$RCC_DIR/$${first(QMAKE_MOD_RCC)}_combined$${first(QMAKE_EXT_CPP)} -} else { - rcc.output = $$RCC_DIR/$${first(QMAKE_MOD_RCC)}_${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} -} -!contains(QMAKE_RESOURCE_FLAGS, -root):!isEmpty(QMAKE_RESOURCE_ROOT):QMAKE_RESOURCE_FLAGS += -root $$QMAKE_RESOURCE_ROOT -!contains(QMAKE_RESOURCE_FLAGS, -name) { - resource_combine { - isEmpty(QMAKE_RESOURCE_NAME):!isEmpty(TARGET):QMAKE_RESOURCE_NAME = $$TARGET - !isEmpty(QMAKE_RESOURCE_NAME):QMAKE_RESOURCE_FLAGS += -name $$QMAKE_RESOURCE_NAME - } else { - QMAKE_RESOURCE_FLAGS += -name ${QMAKE_FILE_BASE} - } -} -rcc.commands = "$$QMAKE_RCC" $$QMAKE_RESOURCE_FLAGS "${QMAKE_FILE_IN}" -o "${QMAKE_FILE_OUT}" -rcc.depend_command = "$$QMAKE_RCC" -list $$QMAKE_RESOURCE_FLAGS "${QMAKE_FILE_IN}" -rcc.input = RESOURCES -rcc.variable_out = SOURCES -rcc.name = RCC ${QMAKE_FILE_IN} -silent:rcc.commands = @echo rcc "${QMAKE_FILE_IN}" && $$rcc.commands -QMAKE_EXTRA_COMPILERS += rcc diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/uic.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/uic.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/uic.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/uic.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -defined(qtPrepareTool)|load(qt_functions) ### Qt 5: see default_pre.prf -qtPrepareTool(QMAKE_UIC3, uic3) -qtPrepareTool(QMAKE_UIC, uic-qt4) - -isEmpty(UI_DIR):UI_DIR = . -isEmpty(UI_SOURCES_DIR):UI_SOURCES_DIR = $$UI_DIR -isEmpty(UI_HEADERS_DIR):UI_HEADERS_DIR = $$UI_DIR -isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ - -# Allow FORMS3 to contain old UIC3 forms, while FORMS contains new -# UIC files in the same project. However, if CONFIG+=uic3 and no -# FORMS3 is defined, FORMS may only contain old UIC3 files. - -!uic3|!isEmpty(FORMS3) { - # If we have CONFIG+=uic3 and no FORMS3, then don't do this step, - # as UIC3 files don't need a ui_.h file - - uic.commands = $$QMAKE_UIC ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - uic.depend_command = "$$QMAKE_UIC" -d "${QMAKE_FILE_IN}" - uic.output = $$UI_HEADERS_DIR/$${QMAKE_MOD_UIC}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic.input = FORMS - uic.variable_out = GENERATED_FILES - uic.CONFIG += no_link target_predeps - uic.name = UIC ${QMAKE_FILE_IN} - silent:uic.commands = @echo uic ${QMAKE_FILE_IN} && $$uic.commands - QMAKE_EXTRA_COMPILERS += uic - INCREDIBUILD_XGE += uic -} - -!isEmpty(FORMS)|!isEmpty(FORMS3) { - ui_dir_short = $$UI_HEADERS_DIR - contains(QMAKE_HOST.os,Windows):ui_dir_short ~= s,^.:,/, - contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_HEADERS_DIR - else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR -} - -# Backwards compatibility: Make shadow builds with default UI_DIR work -# if the user did not add the source dir explicitly. -equals(UI_DIR, .) { - CONFIG -= include_source_dir - CONFIG = include_source_dir $$CONFIG -} - -uic3 { - isEmpty(FORMS3) { - UIC3_FORMS = FORMS - !build_pass:message("Project contains CONFIG+=uic3, but no files in FORMS3; UI files in FORMS treated as UIC3 form files.") - } else { - UIC3_FORMS = FORMS3 - } - - uic3_decl.commands = $$QMAKE_UIC3 ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - uic3_decl.dependency_type = TYPE_UI - uic3_decl.output = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic3_decl.input = $$UIC3_FORMS - uic3_decl.CONFIG += no_link - uic3_decl.variable_out = GENERATED_FILES UIC3_HEADERS - uic3_decl.name = UIC3 Decl ${QMAKE_FILE_IN} - silent:uic3_decl.commands = @echo uic3 ${QMAKE_FILE_IN} && $$uic3_decl.commands - QMAKE_EXTRA_COMPILERS += uic3_decl - - uic3_impl.commands = $$QMAKE_UIC3 -impl ${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - uic3_impl.dependency_type = TYPE_UI - uic3_impl.output = $$UI_SOURCES_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_CPP)} - uic3_impl.depends = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic3_impl.input = $$UIC3_FORMS - uic3_impl.variable_out = GENERATED_SOURCES - uic3_impl.name = UIC3 Impl ${QMAKE_FILE_IN} - silent:uic3_impl.commands = @echo uic3 -impl ${QMAKE_FILE_IN} && $$uic3_impl.commands - QMAKE_EXTRA_COMPILERS += uic3_impl - - ### add a moc step - load(moc) - uic3_moc.commands = $$moc_header.commands - uic3_moc.output = $$moc_header.output - uic3_moc.depends = $$UI_HEADERS_DIR/${QMAKE_FILE_BASE}$${first(QMAKE_EXT_H)} - uic3_moc.input = UIC3_HEADERS - uic3_moc.variable_out = GENERATED_SOURCES - uic3_moc.name = $$moc_header.name - QMAKE_EXTRA_COMPILERS += uic3_moc -} - -defineReplace(imageCollectionCmd) { - unset(EMBEDDED_IMAGES) - RET = - for(image, $$list($$split(1))) { - EMBEDDED_IMAGES += $$image - count(EMBEDDED_IMAGES, 5) { - isEmpty(RET): RET += echo $$EMBEDDED_IMAGES > images.tmp $$escape_expand(\\n\\t) - else: RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\\n\\t) - unset(EMBEDDED_IMAGES) - } - } - !isEmpty(EMBEDDED_IMAGES):RET += echo $$EMBEDDED_IMAGES >> images.tmp $$escape_expand(\\n\\t) - !isEmpty(RET) { - RET += $$QMAKE_UIC3 -embed $$TARGET -f images.tmp -o $$2 $$escape_expand(\\n\\t) - return($$RET) - } - return($$QMAKE_UIC3 -embed $$TARGET $$1 -o $$2) -} - -image_collection.output = qmake_image_collection$${first(QMAKE_EXT_CPP)} -image_collection.variable_out = SOURCES -image_collection.input = IMAGES -image_collection.CONFIG += combine -image_collection.name = UIC3 Image collection in ${QMAKE_FILE_OUT} -!win32 { - image_collection.commands = $$QMAKE_UIC3 -embed $$TARGET ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} - silent:image_collection.commands = @echo uic3 -embed ${QMAKE_FILE_IN} && $$image_collection.commands -} else { - image_collection.commands = ${QMAKE_FUNC_imageCollectionCmd} - silent:image_collection.commands = @echo uic3 -embed $$TARGET -f images.tmp && $image_collection.commands -} -QMAKE_EXTRA_COMPILERS += image_collection - - diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/unix/thread.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/unix/thread.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/unix/thread.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/unix/thread.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -!isEmpty(QMAKE_CFLAGS_THREAD) { - QMAKE_CFLAGS += $$QMAKE_CFLAGS_THREAD - QMAKE_EXPORT_CFLAGS += $$QMAKE_CFLAGS_THREAD -} -!isEmpty(QMAKE_CXXFLAGS_THREAD) { - QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_THREAD - QMAKE_EXPORT_CXXFLAGS += $$QMAKE_CXXFLAGS_THREAD -} -INCLUDEPATH += $$QMAKE_INCDIR_THREAD -LIBS += $$QMAKE_LIBS_THREAD -!isEmpty(QMAKE_LFLAGS_THREAD):QMAKE_LFLAGS += $$QMAKE_LFLAGS_THREAD -!isEmpty(QMAKE_CC_THREAD):QMAKE_CC = $$QMAKE_CC_THREAD -!isEmpty(QMAKE_CXX_THREAD):QMAKE_CXX = $$QMAKE_CXX_THREAD -!isEmpty(QMAKE_LINK_THREAD):QMAKE_LINK = $$QMAKE_LINK_THREAD diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/warn_on.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/warn_on.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/warn_on.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/warn_on.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -CONFIG -= warn_off -QMAKE_CFLAGS += $$QMAKE_CFLAGS_WARN_ON -QMAKE_CXXFLAGS += $$QMAKE_CXXFLAGS_WARN_ON -QMAKE_OBJECTIVE_CFLAGS += $$QMAKE_OBJECTIVE_CFLAGS_WARN_ON - diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/features/yacc.prf robocut-1.0.8/usr/share/qt4/mkspecs/features/yacc.prf --- robocut-1.0.6/usr/share/qt4/mkspecs/features/yacc.prf 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/features/yacc.prf 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -# -# Yacc extra-compiler for handling files specified in the YACCSOURCES variable -# - -{ - yacc_decl.name = Yacc header - yacc_decl.input = YACCSOURCES - yacc_decl.variable_out = GENERATED_FILES - - - isEmpty(QMAKE_YACCFLAGS_MANGLE) { - QMAKE_YACCFLAGS_MANGLE = -p ${QMAKE_FILE_BASE} - QMAKE_YACC_HEADER = y.tab.h - QMAKE_YACC_SOURCE = y.tab.c - } else { - QMAKE_YACCFLAGS_MANGLE ~= s/\\$base/${QMAKE_FILE_BASE}/g #backwards compat - QMAKE_YACC_HEADER ~= s/\\$base/${QMAKE_FILE_BASE}/g - QMAKE_YACC_SOURCE ~= s/\\$base/${QMAKE_FILE_BASE}/g - } - QMAKE_YACCDECLFLAGS = $$QMAKE_YACCFLAGS - !yacc_no_name_mangle:QMAKE_YACCDECLFLAGS += $$QMAKE_YACCFLAGS_MANGLE - - yacc_decl.commands = \ - $$QMAKE_YACC $$QMAKE_YACCDECLFLAGS ${QMAKE_FILE_IN}$$escape_expand(\\n\\t) \ - $$QMAKE_DEL_FILE $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) \ - $$QMAKE_MOVE $${QMAKE_YACC_HEADER} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)}$$escape_expand(\\n\\t) \ - $$QMAKE_MOVE $${QMAKE_YACC_SOURCE} $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)}$$escape_expand(\\n\\t) - yacc_decl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)} - - silent:yacc_decl.commands = @echo Yacc ${QMAKE_FILE_IN} && $$yacc_decl.commands - QMAKE_EXTRA_COMPILERS += yacc_decl -} - -{ - yacc_impl.name = source for ${QMAKE_FILE_IN} - yacc_impl.input = YACCSOURCES - yacc_impl.variable_out = GENERATED_SOURCES - yacc_impl.commands = $$escape_expand(\\n) # We don't want any commands where, but if command is empty no rules are created - yacc_impl.depends = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_H)} # Make sure we depend on the step above - yacc_impl.output = $${QMAKE_CPP_MOD_MOC}${QMAKE_FILE_BASE}_yacc$${first(QMAKE_EXT_CPP)} # Faked output from this step, output really created in step above - QMAKE_EXTRA_COMPILERS += yacc_impl -} diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri robocut-1.0.8/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri --- robocut-1.0.6/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -QT_WEBKIT_VERSION = 4.7.0 -QT_WEBKIT_MAJOR_VERSION = 4 -QT_WEBKIT_MINOR_VERSION = 7 -QT_WEBKIT_PATCH_VERSION = 0 -QT_CONFIG *= webkit diff -Nru robocut-1.0.6/usr/share/qt4/mkspecs/qconfig.pri robocut-1.0.8/usr/share/qt4/mkspecs/qconfig.pri --- robocut-1.0.6/usr/share/qt4/mkspecs/qconfig.pri 2010-12-05 23:49:06.000000000 +0000 +++ robocut-1.0.8/usr/share/qt4/mkspecs/qconfig.pri 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -#configuration -CONFIG += exceptions no_mocdepend release stl qt_no_framework -QT_ARCH = x86_64 -QT_EDITION = OpenSource -QT_CONFIG += minimal-config small-config medium-config large-config full-config qt3support accessibility opengl reduce_exports ipv6 clock-gettime clock-monotonic mremap getaddrinfo ipv6ifname getifaddrs inotify system-jpeg system-mng system-png png system-tiff system-freetype system-zlib nis cups iconv glib dbus nas openssl x11sm xshape xvideo xsync xrender mitshm fontconfig xkb alsa xmlpatterns audio-backend svg script scripttools declarative release - -#versioning -QT_VERSION = 4.7.0 -QT_MAJOR_VERSION = 4 -QT_MINOR_VERSION = 7 -QT_PATCH_VERSION = 0 - -#namespaces -QT_LIBINFIX = -QT_NAMESPACE = -QT_NAMESPACE_MAC_CRC = - -QT_GCC_MAJOR_VERSION = 4 -QT_GCC_MINOR_VERSION = 4 -QT_GCC_PATCH_VERSION = 5