> On May 27, 2014, 5:39 p.m., Dennis Nienhüser wrote: > > I still need two changes in MarbleAbstractPresenter.cpp here in order to > > compile/link it with Qt 4.8: > > > > 1) Change the QtMath include to > > #if QT_VERSION >= 0x050000 > > #include <QtMath> > > #else > > #include <qmath.h> > > #endif > > > > 2) Include the moc file > > #include "MarbleAbstractPresenter.moc" > >
Done - Adam ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: https://git.reviewboard.kde.org/r/118203/#review58595 ----------------------------------------------------------- On May 28, 2014, 6:19 a.m., Adam Dabrowski wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > https://git.reviewboard.kde.org/r/118203/ > ----------------------------------------------------------- > > (Updated May 28, 2014, 6:19 a.m.) > > > Review request for Marble. > > > Repository: marble > > > Description > ------- > > A first step to port Marble to Qt Quick 2.0 > Extracted most of QWidget-independent implementation code from MarbleWidget > into MarbleAbstractPresenter > Adjusted MarblePhysics as an example of a port for a class that formerly used > MarbleWidget > Wrote a stub QQuickItem class. This was tested with QML 2.0 and works > (displays maps and reacts to keyboard input). > > Still a work in progress, but a chunk that can be pushed without breaking > anything. > > > Diffs > ----- > > examples/cpp/CMakeLists.txt 98a1ae4 > examples/cpp/marbleQuick2/CMakeLists.txt PRE-CREATION > examples/cpp/marbleQuick2/CMakeLists.txt.external PRE-CREATION > examples/cpp/marbleQuick2/Readme.txt PRE-CREATION > examples/cpp/marbleQuick2/main.cpp PRE-CREATION > examples/cpp/marbleQuick2/main.qml PRE-CREATION > src/lib/marble/CMakeLists.txt 5b4a0ee > src/lib/marble/MarbleAbstractPresenter.h PRE-CREATION > src/lib/marble/MarbleAbstractPresenter.cpp PRE-CREATION > src/lib/marble/MarblePhysics.h 8559809 > src/lib/marble/MarblePhysics.cpp 9c4b112 > src/lib/marble/MarbleQuickItem.h PRE-CREATION > src/lib/marble/MarbleQuickItem.cpp PRE-CREATION > src/lib/marble/MarbleWidget.cpp 10b466e > > Diff: https://git.reviewboard.kde.org/r/118203/diff/ > > > Testing > ------- > > Tested using attached app. > Also did a regression tests for MarbleWidget (simple ones) > > > Thanks, > > Adam Dabrowski > >
_______________________________________________ Marble-devel mailing list [email protected] https://mail.kde.org/mailman/listinfo/marble-devel
