Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert changes done to 'qmlscratchbox'

Browse source
This commit is contained in:
Alexander Ivash 2018-06-05 22:56:07 +03:00
parent 9bf3759e8d
commit 6a09501261
4 changed files with 4 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/ui/src/FileDialogHelper.cpp
View file

@ -52,7 +52,7 @@ QUrl FileDialogHelper::pathToUrl(const QString& path) {
QUrl FileDialogHelper::saveHelper(const QString& saveText, const QUrl& currentFolder, const QStringList& selectionFilters) { QUrl FileDialogHelper::saveHelper(const QString& saveText, const QUrl& currentFolder, const QStringList& selectionFilters) {
// qDebug(uiLogging) << "Calling save helper with " << saveText << " " << currentFolder << " " << selectionFilters; qDebug(uiLogging) << "Calling save helper with " << saveText << " " << currentFolder << " " << selectionFilters;
QFileInfo fileInfo(saveText); QFileInfo fileInfo(saveText);

14
tests-manual/ui/qml/ControlsGalleryWindow.qml
View file

@ -1,14 +0,0 @@
import QtQuick 2.0
import QtQuick.Window 2.3
import QtQuick.Controls 1.4
import '../../../scripts/developer/tests' as Tests
ApplicationWindow {
width: 640
height: 480
visible: true
Tests.ControlsGallery {
anchors.fill: parent
}
}

5
tests-manual/ui/qmlscratch.pro
View file

@ -34,7 +34,4 @@ DISTFILES += \
../../interface/resources/qml/hifi/toolbars/*.qml \ ../../interface/resources/qml/hifi/toolbars/*.qml \
../../interface/resources/qml/hifi/dialogs/*.qml \ ../../interface/resources/qml/hifi/dialogs/*.qml \
../../interface/resources/qml/hifi/dialogs/preferences/*.qml \ ../../interface/resources/qml/hifi/dialogs/preferences/*.qml \
../../interface/resources/qml/hifi/overlays/*.qml \ ../../interface/resources/qml/hifi/overlays/*.qml
../../scripts/developer/tests/Introspector.qml \
../../scripts/developer/tests/ControlsGallery.qml \
qml/ControlsGalleryWindow.qml

18
tests-manual/ui/src/main.cpp
View file

@ -95,7 +95,6 @@ int main(int argc, char *argv[]) {
app.setApplicationName("Amazing Application"); app.setApplicationName("Amazing Application");
QDir::setCurrent(getRelativeDir("..")); QDir::setCurrent(getRelativeDir(".."));
/*
QtWebEngine::initialize(); QtWebEngine::initialize();
qmlRegisterType<Preference>("Hifi", 1, 0, "Preference"); qmlRegisterType<Preference>("Hifi", 1, 0, "Preference");
@ -118,21 +117,9 @@ int main(int argc, char *argv[]) {
setChild(engine, "urlHandler"); setChild(engine, "urlHandler");
engine.rootContext()->setContextProperty("DebugQML", true); engine.rootContext()->setContextProperty("DebugQML", true);
engine.rootContext()->setContextProperty("fileDialogHelper", new FileDialogHelper()); engine.rootContext()->setContextProperty("fileDialogHelper", new FileDialogHelper());
*/
QQmlApplicationEngine engine; //engine.load(QUrl(QStringLiteral("qrc:/qml/gallery/main.qml")));
addImportPath(engine, "qml"); engine.load(QUrl(QStringLiteral("qml/main.qml")));
addImportPath(engine, "../../interface/resources/qml");
addImportPath(engine, "../../interface/resources");
addImportPath(engine, "../../scripts/developer/tests");
QFontDatabase::addApplicationFont("../../interface/resources/fonts/FiraSans-Regular.ttf");
QFontDatabase::addApplicationFont("../../interface/resources/fonts/FiraSans-SemiBold.ttf");
QFontDatabase::addApplicationFont("../../interface/resources/fonts/hifi-glyphs.ttf");
engine.load(QUrl(QStringLiteral("qml/ControlsGalleryWindow.qml")));
/*
for (QObject* rootObject : engine.rootObjects()) { for (QObject* rootObject : engine.rootObjects()) {
if (rootObject->objectName() == "MainWindow") { if (rootObject->objectName() == "MainWindow") {
Reticle* reticle = new Reticle(rootObject); Reticle* reticle = new Reticle(rootObject);
@ -142,7 +129,6 @@ int main(int argc, char *argv[]) {
break; break;
} }
} }
*/
return app.exec(); return app.exec();
} }