History

Merge branch 'master' of https://github.com/highfidelity/hifi into 20170

Stojce Slavkovski committed 12 years ago

Commit cc487d72 parents 06da1bd 8b4b2c5207 files · +13014 −5580Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.h (1 of 207 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.h+7−0
@@ -15,6 +15,11 @@ · 14 unmodified lines
1515 #include <QObject>
1616 #include <QScriptValue>
1717 #include <QString>
18+#include <QFileDialog>
19+#include <QComboBox>
20+#include <QLineEdit>
21+
22+#include "WebWindowClass.h"
1823
1924 class WindowScriptingInterface : public QObject {
2025 Q_OBJECT
@@ -72,6 +77,8 @@ private slots: · 51 unmodified lines
7277
7378 void nonBlockingFormAccepted() { _nonBlockingFormActive = false; _formResult = QDialog::Accepted; emit nonBlockingFormClosed(); }
7479 void nonBlockingFormRejected() { _nonBlockingFormActive = false; _formResult = QDialog::Rejected; emit nonBlockingFormClosed(); }
80+
81+ WebWindowClass* doCreateWebWindow(const QString& title, const QString& url, int width, int height);
7582
7683 private:
7784 WindowScriptingInterface();