On Monday 25 March 2013 14:05:28 Alexandr Akulich wrote: > Hi all. > I have discovered a bug with compilation of frameworks branch of kdelibs. > Content of current version of kdelibs/libkdeqt5staging/src/qtest_staging.h > has been commited to upstream, so should be removed to avoid compilation > errors.
Only once qt5.git has been updated. > I don't know, what is better - get rid conflicted part of content > of qtest_staging.h (and suppose that this file will be used for some > similar stuff), or remove whole file as well as references at: > kdecore/tests/kdatetimetest.cpp:24 > staging/kde4support/src/kdecore/qtest_kde.h:24 > libkdeqt5staging/src/CMakeLists.txt:29 The patch is ready, but can't be applied yet. Please use qt5.git dev (which points to an older qtbase.git), rather than qtbase.git dev. -- David Faure, fa...@kde.org, http://www.davidfaure.fr Sponsored by BlueSystems and KDAB to work on KDE Frameworks _______________________________________________ Kde-frameworks-devel mailing list Kde-frameworks-devel@kde.org https://mail.kde.org/mailman/listinfo/kde-frameworks-devel