Changeset 79a7671 for src/mvc


Ignore:
Timestamp:
08/30/17 21:15:52 (5 years ago)
Author:
gregor herrmann <gregor@…>
Branches:
master, qt5
Children:
30edeb7
Parents:
809b5e5
Message:

ifdef qt4 and qt5

Location:
src/mvc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • src/mvc/delegate.h

    r809b5e5 r79a7671  
    2121#define DELEGATE_H
    2222
     23#include "qglobal.h"
     24#if QT_VERSION >= 0x050000
    2325#include <QtWidgets>
     26#else
     27#include <QtGui>
     28#endif
    2429
    2530class Delegate : public QItemDelegate
  • src/mvc/eventmodel.cpp

    r809b5e5 r79a7671  
    177177    if (!parent.isValid())
    178178    {
    179         return createIndex(row, column, (quintptr) 0);
     179        return createIndex(row, column);
    180180    }
    181181    else if (parent.internalId() == 0)
     
    202202        Event * event = static_cast<Event*>(index.internalPointer());
    203203
    204         return createIndex(mParents[event->id()], 0, (quintptr) 0);
     204        return createIndex(mParents[event->id()], 0);
    205205    }
    206206
  • src/mvc/mvc.pro

    r809b5e5 r79a7671  
    44DESTDIR = ../bin
    55CONFIG += static
    6 QT += sql \
    7     widgets
     6QT += sql
     7greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
    88QMAKE_CLEAN += ../bin/libmvc.a
    99
Note: See TracChangeset for help on using the changeset viewer.