Commit db5bd1ec authored by Utkarsh Ayachit's avatar Utkarsh Ayachit

Temporarily overcome Qt 5.3 issues.

Simply disabling pqNativeFileDialogEventTranslator and
pqNativeFileDialogEventPlayer until we get a proper fix for this.
Doesn't look like we can use this internal API from Qt 4 anymore.
parent b5734883
......@@ -38,6 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "pqEventDispatcher.h"
#include "pqTestUtility.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options);
extern Q_DECL_IMPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
......@@ -92,7 +93,6 @@ namespace
}
pqNativeFileDialogEventPlayer::pqNativeFileDialogEventPlayer(pqTestUtility* util, QObject* p)
: pqWidgetEventPlayer(p), mUtil(util)
{
......@@ -175,3 +175,31 @@ bool pqNativeFileDialogEventPlayer::playEvent(QObject* Object, const QString& Co
return false;
}
#else
//-----------------------------------------------------------------------------
pqNativeFileDialogEventPlayer::pqNativeFileDialogEventPlayer(
pqTestUtility* util, QObject* p) : pqWidgetEventPlayer(p), mUtil(util)
{
}
pqNativeFileDialogEventPlayer::~pqNativeFileDialogEventPlayer()
{
}
void pqNativeFileDialogEventPlayer::start()
{
}
void pqNativeFileDialogEventPlayer::stop()
{
}
bool pqNativeFileDialogEventPlayer::playEvent(
QObject* Object, const QString& Command, const QString& Arguments, bool& Error)
{
Q_UNUSED(Object);
Q_UNUSED(Command);
Q_UNUSED(Arguments);
Q_UNUSED(Error);
return false;
}
#endif
......@@ -38,6 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "pqEventTranslator.h"
#include "pqTestUtility.h"
#if QT_VERSION < QT_VERSION_CHECK(5, 3, 0)
typedef QString (*_qt_filedialog_existing_directory_hook)(QWidget *parent, const QString &caption, const QString &dir, QFileDialog::Options options);
extern Q_DECL_IMPORT _qt_filedialog_existing_directory_hook qt_filedialog_existing_directory_hook;
......@@ -182,3 +183,33 @@ void pqNativeFileDialogEventTranslator::record(const QString& command, const QSt
emit this->recordEvent(QApplication::instance(), command, normalized_files.join(";"));
}
#else
pqNativeFileDialogEventTranslator::pqNativeFileDialogEventTranslator(
pqTestUtility* util, QObject* p) : pqWidgetEventTranslator(p), mUtil(util)
{
}
pqNativeFileDialogEventTranslator::~pqNativeFileDialogEventTranslator()
{
}
void pqNativeFileDialogEventTranslator::start()
{
}
void pqNativeFileDialogEventTranslator::stop()
{
}
bool pqNativeFileDialogEventTranslator::translateEvent(
QObject* pqNotUsed(Object), QEvent* pqNotUsed(Event), bool& pqNotUsed(Error))
{
return false;
}
void pqNativeFileDialogEventTranslator::record(const QString& command, const QString& args)
{
Q_UNUSED(command);
Q_UNUSED(args);
}
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment