Ignore:
Timestamp:
Dec 2, 2009, 4:30:02 AM (16 years ago)
Author:
Dmitry A. Kuminov
Message:

tools: Patched qdesigner to make it compile without Drag&Drop.

Location:
trunk/tools/designer/src/components
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/tools/designer/src/components/formeditor/tool_widgeteditor.cpp

    r2 r372  
    166166        return !passive && handleContextMenu(widget, managedWidget, static_cast<QContextMenuEvent*>(event));
    167167
     168#ifndef QT_NO_DRAGANDDROP
    168169    case QEvent::DragEnter:
    169170        return handleDragEnterMoveEvent(widget, managedWidget, static_cast<QDragEnterEvent *>(event), true);
    … …  
    174175    case QEvent::Drop:
    175176        return handleDropEvent(widget, managedWidget, static_cast<QDropEvent *>(event));
     177#endif
    176178    default:
    177179        break;
    … …  
    247249}
    248250
     251#ifndef QT_NO_DRAGANDDROP
    249252bool WidgetEditorTool::handleDragEnterMoveEvent(QWidget *widget, QWidget * /*managedWidget*/, QDragMoveEvent *e, bool isEnter)
    250253{
    … …  
    315318    return true;
    316319}
     320#endif
    317321
    318322bool WidgetEditorTool::restoreDropHighlighting()
    … …  
    326330}
    327331
     332#ifndef QT_NO_DRAGANDDROP
    328333bool WidgetEditorTool::handleDragLeaveEvent(QWidget *, QWidget *, QDragLeaveEvent *event)
    329334{
    … …  
    334339    return false;
    335340}
     341#endif
    336342
    337343QWidget *WidgetEditorTool::editor() const

  • trunk/tools/designer/src/components/formeditor/tool_widgeteditor.h

    r2 r372  
    8484    bool handlePaintEvent(QWidget *widget, QWidget *managedWidget, QPaintEvent *e);
    8585
     86#ifndef QT_NO_DRAGANDDROP
    8687    bool handleDragEnterMoveEvent(QWidget *widget, QWidget *managedWidget, QDragMoveEvent *e, bool isEnter);
    8788    bool handleDragLeaveEvent(QWidget *widget, QWidget *managedWidget, QDragLeaveEvent *e);
    8889    bool handleDropEvent(QWidget *widget, QWidget *managedWidget, QDropEvent *e);
     90#endif
    8991
    9092private:

  • trunk/tools/designer/src/components/lib/lib.pro

    r2 r372  
    11TEMPLATE = lib
    22TARGET = QtDesignerComponents
     3os2:TARGET_SHORT = QtDsgC
    34contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
    45CONFIG += qt depend_prl no_objective_c designer

  • trunk/tools/designer/src/components/objectinspector/objectinspector.cpp

    r2 r372  
    346346void ObjectInspector::ObjectInspectorPrivate::handleDragEnterMoveEvent(const QWidget *objectInspectorWidget, QDragMoveEvent * event, bool isDragEnter)
    347347{
     348#ifndef QT_NO_DRAGANDDROP
    348349    if (!m_formWindow) {
    349350        event->ignore();
    … …  
    379380    else
    380381        event->ignore();
     382#endif
    381383}
    382384void  ObjectInspector::ObjectInspectorPrivate::dropEvent (QDropEvent * event)
    383385{
     386#ifndef QT_NO_DRAGANDDROP
    384387    if (!m_formWindow || !m_formFakeDropTarget) {
    385388        event->ignore();
    … …  
    399402    }
    400403    mimeData->acceptEvent(event);
     404#endif
    401405}
    402406
    … …  
    818822void  ObjectInspector::dragEnterEvent (QDragEnterEvent * event)
    819823{
     824#ifndef QT_NO_DRAGANDDROP
    820825    m_impl->handleDragEnterMoveEvent(this, event, true);
     826#endif
    821827}
    822828
    823829void  ObjectInspector::dragMoveEvent(QDragMoveEvent * event)
    824830{
     831#ifndef QT_NO_DRAGANDDROP
    825832    m_impl->handleDragEnterMoveEvent(this, event, false);
     833#endif
    826834}
    827835
    828836void  ObjectInspector::dragLeaveEvent(QDragLeaveEvent * /* event*/)
    829837{
     838#ifndef QT_NO_DRAGANDDROP
    830839    m_impl->restoreDropHighlighting();
     840#endif
    831841}
    832842
    833843void  ObjectInspector::dropEvent (QDropEvent * event)
    834844{
     845#ifndef QT_NO_DRAGANDDROP
    835846    m_impl->dropEvent(event);
     847#endif
    836848
    837849QT_END_NAMESPACE

  • trunk/tools/designer/src/components/propertyeditor/paletteeditor.cpp

    r2 r372  
    8888                this, SLOT(paletteChanged(const QPalette &)));
    8989    ui.paletteView->setSelectionBehavior(QAbstractItemView::SelectRows);
     90#ifndef QT_NO_DRAGANDDROP
    9091    ui.paletteView->setDragEnabled(true);
    9192    ui.paletteView->setDropIndicatorShown(true);
     93#endif
    9294    ui.paletteView->setRootIsDecorated(false);
    9395    ui.paletteView->setColumnHidden(2, true);

  • trunk/tools/designer/src/components/widgetbox/widgetbox.cpp

    r2 r372  
    180180                                               bool acceptEventsFromWidgetBox)
    181181{
     182#ifndef QT_NO_DRAGANDDROP
    182183    const QDesignerMimeData *mimeData = qobject_cast<const QDesignerMimeData *>(event->mimeData());
    183184    if (!mimeData) {
    … …  
    196197    mimeData->acceptEvent(event);
    197198    return mimeData;
     199#else
     200    return 0;
     201#endif
    198202}
    199203
    200204void WidgetBox::dragEnterEvent (QDragEnterEvent * event)
    201205{
     206#ifndef QT_NO_DRAGANDDROP
    202207    // We accept event originating from the widget box also here,
    203208    // because otherwise Windows will not show the DnD pixmap.
    204209    checkDragEvent(event, true);
     210#endif
    205211}
    206212
    207213void WidgetBox::dragMoveEvent(QDragMoveEvent * event)
    208214{
     215#ifndef QT_NO_DRAGANDDROP
    209216    checkDragEvent(event, true);
     217#endif
    210218}
    211219
    212220void WidgetBox::dropEvent(QDropEvent * event)
    213221{
     222#ifndef QT_NO_DRAGANDDROP
    214223    const QDesignerMimeData *mimeData = checkDragEvent(event, false);
    215224    if (!mimeData)
    … …  
    218227    dropWidgets(mimeData->items(), event->pos());
    219228    QDesignerMimeData::removeMovedWidgetsFromSourceForm(mimeData->items());
     229#endif
    220230}
    221231
Note: See TracChangeset for help on using the changeset viewer.