projects
/
konrad/qtdeclarative.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
(parent:
0321378
)
Support opening filedialog again in qmlscene
author
Gunnar Sletta
<gunnar.sletta@nokia.com>
Tue, 13 Dec 2011 10:06:15 +0000 (11:06 +0100)
committer
Qt by Nokia
<qt-info@nokia.com>
Wed, 14 Dec 2011 03:50:42 +0000 (
04:50
+0100)
Change-Id: If6d7dded83a4bbb5d68b74741fc7a531165b7fef
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
tools/qmlscene/main.cpp
patch
|
blob
|
history
diff --git
a/tools/qmlscene/main.cpp
b/tools/qmlscene/main.cpp
index
41113f1
..
19dd94b
100644
(file)
--- a/
tools/qmlscene/main.cpp
+++ b/
tools/qmlscene/main.cpp
@@
-56,6
+56,7
@@
#include <QtQuick/qquickview.h>
#ifdef QT_WIDGETS_LIB
+#include <QtWidgets/QApplication>
#include <QtWidgets/QFileDialog>
#endif
@@
-375,7
+376,11
@@
int main(int argc, char ** argv)
}
}
+#ifdef QT_WIDGETS_LIB
+ QApplication app(argc, argv);
+#else
QGuiApplication app(argc, argv);
+#endif
app.setApplicationName("QtQmlViewer");
app.setOrganizationName("Nokia");
app.setOrganizationDomain("nokia.com");