The Simple Text Viewer enables the user to select and view
- existing files.
+ existing files.
diff -Nru qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/documentation/openfile.html qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/documentation/openfile.html
--- qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/documentation/openfile.html 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/documentation/openfile.html 2014-05-15 17:12:38.000000000 +0000
@@ -1,11 +1,11 @@
-
- Open File
+
+ Open File
- Open File
+ Open File
Once the file you want to view appears in the dialog's
diff -Nru qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/documentation/wildcardmatching.html qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/documentation/wildcardmatching.html
--- qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/documentation/wildcardmatching.html 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/documentation/wildcardmatching.html 2014-05-15 17:12:38.000000000 +0000
@@ -1,16 +1,16 @@
-
- Wildcard Matching
+
+ Wildcard Matching
- Wildcard Matching
+ Wildcard Matching
Most command shells such as bash or cmd.exe support "file
globbing", the ability to identify a group of files by using
- wildcards.
+ wildcards.
@@ -23,20 +23,20 @@
- Wildcard matching provides four features:
-
+ Wildcard matching provides four features:
+
-
- - Any character represents itself apart from those
- mentioned below. Thus 'c' matches the character 'c'.
+
+ - Any character represents itself apart from those
+ mentioned below. Thus 'c' matches the character 'c'.
- - The '?' character matches any single character.
- - The '*' matches zero or more of any characters.
- - Sets of characters can be represented in square brackets.
- Within the character class, like outside, backslash
+
- The '?' character matches any single character.
+ - The '*' matches zero or more of any characters.
+ - Sets of characters can be represented in square brackets.
+ Within the character class, like outside, backslash
has no special meaning.
-
-
+
+
For example we could identify HTML files with
diff -Nru qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/findfiledialog.cpp qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/findfiledialog.cpp
--- qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/findfiledialog.cpp 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/findfiledialog.cpp 2014-05-15 17:12:38.000000000 +0000
@@ -91,7 +91,7 @@
//! [2]
void FindFileDialog::help()
{
- currentAssistant->showDocumentation("filedialog.html");
+ currentAssistant->showDocumentation("filedialog.html");
}
//! [2]
diff -Nru qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/mainwindow.cpp qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/mainwindow.cpp
--- qttools-opensource-src-5.2.1/examples/assistant/simpletextviewer/mainwindow.cpp 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/assistant/simpletextviewer/mainwindow.cpp 2014-05-15 17:12:38.000000000 +0000
@@ -87,7 +87,7 @@
//! [3]
void MainWindow::showDocumentation()
{
- assistant->showDocumentation("index.html");
+ assistant->showDocumentation("index.html");
}
//! [3]
diff -Nru qttools-opensource-src-5.2.1/examples/designer/containerextension/containerextension.pro qttools-opensource-src-5.3.0/examples/designer/containerextension/containerextension.pro
--- qttools-opensource-src-5.2.1/examples/designer/containerextension/containerextension.pro 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/designer/containerextension/containerextension.pro 2014-05-15 17:12:38.000000000 +0000
@@ -24,14 +24,14 @@
#! [2]
HEADERS += multipagewidget.h \
- multipagewidgetplugin.h \
+ multipagewidgetplugin.h \
multipagewidgetcontainerextension.h \
- multipagewidgetextensionfactory.h
+ multipagewidgetextensionfactory.h
SOURCES += multipagewidget.cpp \
multipagewidgetplugin.cpp \
multipagewidgetcontainerextension.cpp \
- multipagewidgetextensionfactory.cpp
+ multipagewidgetextensionfactory.cpp
OTHER_FILES += multipagewidget.json
#! [2]
diff -Nru qttools-opensource-src-5.2.1/examples/designer/containerextension/multipagewidget.h qttools-opensource-src-5.3.0/examples/designer/containerextension/multipagewidget.h
--- qttools-opensource-src-5.2.1/examples/designer/containerextension/multipagewidget.h 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/designer/containerextension/multipagewidget.h 2014-05-15 17:12:38.000000000 +0000
@@ -65,8 +65,8 @@
int currentIndex() const;
QWidget *widget(int index);
QString pageTitle() const;
-
-public slots:
+
+public slots:
void addPage(QWidget *page);
void insertPage(int index, QWidget *page);
void removePage(int index);
diff -Nru qttools-opensource-src-5.2.1/examples/designer/designer.pro qttools-opensource-src-5.3.0/examples/designer/designer.pro
--- qttools-opensource-src-5.2.1/examples/designer/designer.pro 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/designer/designer.pro 2014-05-15 17:12:38.000000000 +0000
@@ -10,7 +10,7 @@
# the sun cc compiler has a problem with the include lines for the form.prf
solaris-cc*:SUBDIRS -= calculatorbuilder \
- worldtimeclockbuilder
+ worldtimeclockbuilder
qtNomakeTools( \
containerextension \
diff -Nru qttools-opensource-src-5.2.1/examples/help/contextsensitivehelp/helpbrowser.cpp qttools-opensource-src-5.3.0/examples/help/contextsensitivehelp/helpbrowser.cpp
--- qttools-opensource-src-5.2.1/examples/help/contextsensitivehelp/helpbrowser.cpp 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/help/contextsensitivehelp/helpbrowser.cpp 2014-05-15 17:12:38.000000000 +0000
@@ -71,9 +71,9 @@
QByteArray ba;
if (type < 4 && m_helpEngine) {
QUrl url(name);
- if (name.isRelative())
+ if (name.isRelative())
url = source().resolved(url);
- ba = m_helpEngine->fileData(url);
+ ba = m_helpEngine->fileData(url);
}
return ba;
}
diff -Nru qttools-opensource-src-5.2.1/examples/help/contextsensitivehelp/main.cpp qttools-opensource-src-5.3.0/examples/help/contextsensitivehelp/main.cpp
--- qttools-opensource-src-5.2.1/examples/help/contextsensitivehelp/main.cpp 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/help/contextsensitivehelp/main.cpp 2014-05-15 17:12:38.000000000 +0000
@@ -44,7 +44,7 @@
int main(int argc, char *argv[])
{
- QApplication a(argc, argv);
+ QApplication a(argc, argv);
WateringConfigDialog dia;
return dia.exec();
}
diff -Nru qttools-opensource-src-5.2.1/examples/help/contextsensitivehelp/wateringconfigdialog.h qttools-opensource-src-5.3.0/examples/help/contextsensitivehelp/wateringconfigdialog.h
--- qttools-opensource-src-5.2.1/examples/help/contextsensitivehelp/wateringconfigdialog.h 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/help/contextsensitivehelp/wateringconfigdialog.h 2014-05-15 17:12:38.000000000 +0000
@@ -52,7 +52,7 @@
private slots:
void focusChanged(QWidget *old, QWidget *now);
-
+
private:
Ui::WateringConfigDialog m_ui;
QMap m_widgetInfo;
diff -Nru qttools-opensource-src-5.2.1/examples/uitools/multipleinheritance/multipleinheritance.pro qttools-opensource-src-5.3.0/examples/uitools/multipleinheritance/multipleinheritance.pro
--- qttools-opensource-src-5.2.1/examples/uitools/multipleinheritance/multipleinheritance.pro 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/uitools/multipleinheritance/multipleinheritance.pro 2014-05-15 17:12:38.000000000 +0000
@@ -1,6 +1,6 @@
#! [0]
SOURCES = calculatorform.cpp main.cpp
-HEADERS = calculatorform.h
+HEADERS = calculatorform.h
FORMS = calculatorform.ui
#! [0]
diff -Nru qttools-opensource-src-5.2.1/examples/uitools/textfinder/forms/input.txt qttools-opensource-src-5.3.0/examples/uitools/textfinder/forms/input.txt
--- qttools-opensource-src-5.2.1/examples/uitools/textfinder/forms/input.txt 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/uitools/textfinder/forms/input.txt 2014-05-15 17:12:38.000000000 +0000
@@ -1,9 +1,9 @@
-These forms are processed at run-time to produce dynamically-generated user interfaces.
-In order to generate a form at run-time, a resource file containing a UI file is needed.
-Applications that use the form handling classes need to be configured to be built against
-the QtUiTools module. This is done by including the following declaration in a qmake project
-file to ensure that the application is compiled and linked appropriately. A form loader object,
-provided by the QUiLoader class, is used to construct the user interface. This user interface
-can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form
-stored in a project's resources. The QUiLoader::load() function takes the user interface
+These forms are processed at run-time to produce dynamically-generated user interfaces.
+In order to generate a form at run-time, a resource file containing a UI file is needed.
+Applications that use the form handling classes need to be configured to be built against
+the QtUiTools module. This is done by including the following declaration in a qmake project
+file to ensure that the application is compiled and linked appropriately. A form loader object,
+provided by the QUiLoader class, is used to construct the user interface. This user interface
+can be retrieved from any QIODevice; for example, a QFile object can be used to obtain a form
+stored in a project's resources. The QUiLoader::load() function takes the user interface
description contained in the file and constructs the form widget.
\ No newline at end of file
diff -Nru qttools-opensource-src-5.2.1/examples/uitools/textfinder/textfinder.cpp qttools-opensource-src-5.3.0/examples/uitools/textfinder/textfinder.cpp
--- qttools-opensource-src-5.2.1/examples/uitools/textfinder/textfinder.cpp 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/uitools/textfinder/textfinder.cpp 2014-05-15 17:12:38.000000000 +0000
@@ -120,9 +120,9 @@
"The search field is empty. Please enter a word and click Find.");
} else {
- QTextCursor highlightCursor(document);
+ QTextCursor highlightCursor(document);
QTextCursor cursor(document);
-
+
cursor.beginEditBlock();
//! [6]
@@ -149,7 +149,7 @@
if (found == false) {
QMessageBox::information(this, tr("Word Not Found"),
"Sorry, the word cannot be found.");
- }
+ }
}
}
//! [8] //! [9]
diff -Nru qttools-opensource-src-5.2.1/examples/uitools/textfinder/textfinder.h qttools-opensource-src-5.3.0/examples/uitools/textfinder/textfinder.h
--- qttools-opensource-src-5.2.1/examples/uitools/textfinder/textfinder.h 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/uitools/textfinder/textfinder.h 2014-05-15 17:12:38.000000000 +0000
@@ -59,7 +59,7 @@
private slots:
void on_findButton_clicked();
-
+
private:
QWidget* loadUiFile();
void loadTextFile();
diff -Nru qttools-opensource-src-5.2.1/examples/uitools/textfinder/textfinder.pro qttools-opensource-src-5.3.0/examples/uitools/textfinder/textfinder.pro
--- qttools-opensource-src-5.2.1/examples/uitools/textfinder/textfinder.pro 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/examples/uitools/textfinder/textfinder.pro 2014-05-15 17:12:38.000000000 +0000
@@ -1,6 +1,6 @@
-HEADERS = textfinder.h
-RESOURCES = textfinder.qrc
-SOURCES = textfinder.cpp main.cpp
+HEADERS = textfinder.h
+RESOURCES = textfinder.qrc
+SOURCES = textfinder.cpp main.cpp
target.path = $$[QT_INSTALL_EXAMPLES]/uitools/textfinder
INSTALLS += target
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qanalyzer_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qanalyzer_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qanalyzer_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qanalyzer_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qanalyzer_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qclucene-config_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qclucene-config_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qclucene-config_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qclucene-config_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qclucene-config_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qclucene_global_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qclucene_global_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qclucene_global_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qclucene_global_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qclucene_global_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qdocument_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qdocument_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qdocument_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qdocument_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qdocument_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qfield_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qfield_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qfield_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qfield_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qfield_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qfilter_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qfilter_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qfilter_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qfilter_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qfilter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qhits_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qhits_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qhits_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qhits_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qhits_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qindexreader_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qindexreader_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qindexreader_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qindexreader_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qindexreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qindexwriter_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qindexwriter_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qindexwriter_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qindexwriter_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qindexwriter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qqueryparser_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qqueryparser_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qqueryparser_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qqueryparser_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qqueryparser_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qquery_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qquery_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qquery_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qquery_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qquery_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qreader_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qreader_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qreader_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qreader_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qsearchable_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qsearchable_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qsearchable_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qsearchable_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qsearchable_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qsort_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qsort_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qsort_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qsort_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qsort_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qterm_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qterm_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qterm_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qterm_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qterm_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qtokenizer_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qtokenizer_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qtokenizer_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qtokenizer_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qtokenizer_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qtoken_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qtoken_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qtoken_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qtoken_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qtoken_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qtokenstream_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qtokenstream_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.2.1/QtCLucene/private/qtokenstream_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.2.1/QtCLucene/private/qtokenstream_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/clucene/qtokenstream_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qanalyzer_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qanalyzer_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qanalyzer_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qanalyzer_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qanalyzer_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qclucene-config_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qclucene-config_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qclucene-config_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qclucene-config_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qclucene-config_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qclucene_global_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qclucene_global_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qclucene_global_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qclucene_global_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qclucene_global_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qdocument_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qdocument_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qdocument_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qdocument_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qdocument_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qfield_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qfield_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qfield_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qfield_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qfield_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qfilter_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qfilter_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qfilter_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qfilter_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qfilter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qhits_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qhits_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qhits_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qhits_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qhits_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qindexreader_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qindexreader_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qindexreader_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qindexreader_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qindexreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qindexwriter_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qindexwriter_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qindexwriter_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qindexwriter_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qindexwriter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qqueryparser_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qqueryparser_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qqueryparser_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qqueryparser_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qqueryparser_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qquery_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qquery_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qquery_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qquery_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qquery_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qreader_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qreader_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qreader_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qreader_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qsearchable_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qsearchable_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qsearchable_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qsearchable_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qsearchable_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qsort_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qsort_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qsort_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qsort_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qsort_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qterm_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qterm_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qterm_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qterm_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qterm_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qtokenizer_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qtokenizer_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qtokenizer_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qtokenizer_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qtokenizer_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qtoken_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qtoken_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qtoken_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qtoken_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qtoken_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qtokenstream_p.h qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qtokenstream_p.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/5.3.0/QtCLucene/private/qtokenstream_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/5.3.0/QtCLucene/private/qtokenstream_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/clucene/qtokenstream_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/headers.pri qttools-opensource-src-5.3.0/include/QtCLucene/headers.pri
--- qttools-opensource-src-5.2.1/include/QtCLucene/headers.pri 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/headers.pri 2014-05-15 17:12:39.000000000 +0000
@@ -2,3 +2,4 @@
SYNCQT.HEADER_CLASSES = ../../../include/QtCLucene/QtCLuceneVersion
SYNCQT.PRIVATE_HEADER_FILES = qanalyzer_p.h qclucene-config_p.h qclucene_global_p.h qdocument_p.h qfield_p.h qfilter_p.h qhits_p.h qindexreader_p.h qindexwriter_p.h qquery_p.h qqueryparser_p.h qreader_p.h qsearchable_p.h qsort_p.h qterm_p.h qtoken_p.h qtokenizer_p.h qtokenstream_p.h
SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -Nru qttools-opensource-src-5.2.1/include/QtCLucene/qtcluceneversion.h qttools-opensource-src-5.3.0/include/QtCLucene/qtcluceneversion.h
--- qttools-opensource-src-5.2.1/include/QtCLucene/qtcluceneversion.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtCLucene/qtcluceneversion.h 2014-05-15 17:12:39.000000000 +0000
@@ -2,8 +2,8 @@
#ifndef QT_QTCLUCENE_VERSION_H
#define QT_QTCLUCENE_VERSION_H
-#define QTCLUCENE_VERSION_STR "5.2.1"
+#define QTCLUCENE_VERSION_STR "5.3.0"
-#define QTCLUCENE_VERSION 0x050201
+#define QTCLUCENE_VERSION 0x050300
#endif // QT_QTCLUCENE_VERSION_H
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/abstractdialoggui_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/abstractdialoggui_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/abstractdialoggui_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/abstractdialoggui_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/sdk/abstractdialoggui_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/abstractintrospection_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/abstractintrospection_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/abstractintrospection_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/abstractintrospection_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/sdk/abstractintrospection_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/actioneditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/actioneditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/actioneditor_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/actioneditor_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/actioneditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/actionprovider_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/actionprovider_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/actionprovider_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/actionprovider_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/actionprovider_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/actionrepository_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/actionrepository_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/actionrepository_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/actionrepository_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/actionrepository_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/codedialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/codedialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/codedialog_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/codedialog_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/codedialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/connectionedit_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/connectionedit_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/connectionedit_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/connectionedit_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/connectionedit_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/csshighlighter_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/csshighlighter_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/csshighlighter_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/csshighlighter_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/csshighlighter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/deviceprofile_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/deviceprofile_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/deviceprofile_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/deviceprofile_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/deviceprofile_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/dialoggui_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/dialoggui_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/dialoggui_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/dialoggui_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/dialoggui_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/extensionfactory_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/extensionfactory_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/extensionfactory_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/extensionfactory_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/extensionfactory_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/formbuilderextra_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/formbuilderextra_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/formbuilderextra_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/formbuilderextra_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/uilib/formbuilderextra_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/formlayoutmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/formlayoutmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/formlayoutmenu_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/formlayoutmenu_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/formlayoutmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/formwindowbase_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/formwindowbase_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/formwindowbase_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/formwindowbase_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/formwindowbase_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/gridpanel_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/gridpanel_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/gridpanel_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/gridpanel_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/gridpanel_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/grid_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/grid_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/grid_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/grid_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/grid_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/htmlhighlighter_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/htmlhighlighter_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/htmlhighlighter_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/htmlhighlighter_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/htmlhighlighter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/iconloader_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/iconloader_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/iconloader_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/iconloader_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/iconloader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/iconselector_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/iconselector_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/iconselector_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/iconselector_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/iconselector_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/invisible_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/invisible_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/invisible_widget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/invisible_widget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/invisible_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/layoutinfo_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/layoutinfo_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/layoutinfo_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/layoutinfo_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/layoutinfo_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/layout_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/layout_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/layout_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/layout_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/layout_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/lib_pch.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/lib_pch.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/lib_pch.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/lib_pch.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/lib_pch.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/metadatabase_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/metadatabase_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/metadatabase_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/metadatabase_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/metadatabase_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/morphmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/morphmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/morphmenu_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/morphmenu_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/morphmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/newactiondialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/newactiondialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/newactiondialog_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/newactiondialog_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/newactiondialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/newformwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/newformwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/newformwidget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/newformwidget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/newformwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/orderdialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/orderdialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/orderdialog_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/orderdialog_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/orderdialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/plaintexteditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/plaintexteditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/plaintexteditor_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/plaintexteditor_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/plaintexteditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/plugindialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/plugindialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/plugindialog_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/plugindialog_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/plugindialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/pluginmanager_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/pluginmanager_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/pluginmanager_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/pluginmanager_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/pluginmanager_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/previewconfigurationwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/previewconfigurationwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/previewconfigurationwidget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/previewconfigurationwidget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/previewconfigurationwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/previewmanager_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/previewmanager_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/previewmanager_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/previewmanager_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/previewmanager_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/promotionmodel_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/promotionmodel_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/promotionmodel_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/promotionmodel_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/promotionmodel_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/promotiontaskmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/promotiontaskmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/promotiontaskmenu_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/promotiontaskmenu_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/promotiontaskmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/properties_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/properties_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/properties_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/properties_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/uilib/properties_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/propertylineedit_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/propertylineedit_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/propertylineedit_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/propertylineedit_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/propertylineedit_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command2_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command2_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command2_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command2_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_command2_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_command_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_command_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dnditem_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dnditem_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dnditem_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dnditem_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_dnditem_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dockwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dockwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dockwidget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_dockwidget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_dockwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formbuilder_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formbuilder_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formbuilder_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formbuilder_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_formbuilder_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formeditorcommand_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formeditorcommand_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formeditorcommand_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formeditorcommand_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowcommand_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowcommand_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowcommand_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowcommand_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowmanager_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowmanager_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowmanager_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_formwindowmanager_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_introspection_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_introspection_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_introspection_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_introspection_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_introspection_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_membersheet_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_membersheet_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_membersheet_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_membersheet_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_membersheet_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menubar_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menubar_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menubar_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menubar_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_menubar_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menu_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_menu_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_menu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_objectinspector_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_objectinspector_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_objectinspector_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_objectinspector_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_objectinspector_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotiondialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotiondialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotiondialog_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotiondialog_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_promotiondialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotion_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotion_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotion_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_promotion_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_promotion_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertycommand_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertycommand_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertycommand_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertycommand_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_propertycommand_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertyeditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertyeditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertyeditor_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertyeditor_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_propertyeditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertysheet_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertysheet_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertysheet_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_propertysheet_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_propertysheet_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_qsettings_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_qsettings_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_qsettings_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_qsettings_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_qsettings_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_stackedbox_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_stackedbox_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_stackedbox_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_stackedbox_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_stackedbox_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_tabwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_tabwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_tabwidget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_tabwidget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_tabwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_taskmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_taskmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_taskmenu_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_taskmenu_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_taskmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbar_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbar_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbar_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbar_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_toolbar_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbox_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbox_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbox_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_toolbox_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_toolbox_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_utils_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_utils_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_utils_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_utils_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_utils_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetbox_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetbox_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetbox_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetbox_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_widgetbox_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetitem_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetitem_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetitem_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widgetitem_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_widgetitem_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qdesigner_widget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qdesigner_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qlayout_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qlayout_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qlayout_widget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qlayout_widget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qlayout_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qsimpleresource_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qsimpleresource_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qsimpleresource_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qsimpleresource_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qsimpleresource_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceeditordialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceeditordialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceeditordialog_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceeditordialog_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qtresourceeditordialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qtresourcemodel_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qtresourcemodel_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qtresourcemodel_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qtresourcemodel_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qtresourcemodel_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceview_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceview_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceview_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/qtresourceview_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/qtresourceview_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/rcc_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/rcc_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/rcc_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/rcc_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/rcc_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/resourcebuilder_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/resourcebuilder_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/resourcebuilder_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/resourcebuilder_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/uilib/resourcebuilder_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/richtexteditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/richtexteditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/richtexteditor_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/richtexteditor_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/richtexteditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/shared_enums_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/shared_enums_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/shared_enums_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/shared_enums_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/shared_enums_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/shared_global_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/shared_global_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/shared_global_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/shared_global_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/shared_global_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/shared_settings_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/shared_settings_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/shared_settings_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/shared_settings_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/shared_settings_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/sheet_delegate_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/sheet_delegate_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/sheet_delegate_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/sheet_delegate_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/sheet_delegate_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/signalslotdialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/signalslotdialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/signalslotdialog_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/signalslotdialog_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/signalslotdialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/spacer_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/spacer_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/spacer_widget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/spacer_widget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/spacer_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/stylesheeteditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/stylesheeteditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/stylesheeteditor_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/stylesheeteditor_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/stylesheeteditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/textbuilder_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/textbuilder_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/textbuilder_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/textbuilder_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/uilib/textbuilder_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/textpropertyeditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/textpropertyeditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/textpropertyeditor_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/textpropertyeditor_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/textpropertyeditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/ui4_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/ui4_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/ui4_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/ui4_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/uilib/ui4_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/widgetdatabase_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/widgetdatabase_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/widgetdatabase_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/widgetdatabase_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/widgetdatabase_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/widgetfactory_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/widgetfactory_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/widgetfactory_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/widgetfactory_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/widgetfactory_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/zoomwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/zoomwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.2.1/QtDesigner/private/zoomwidget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.2.1/QtDesigner/private/zoomwidget_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/lib/shared/zoomwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/abstractdialoggui_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/abstractdialoggui_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/abstractdialoggui_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/abstractdialoggui_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/sdk/abstractdialoggui_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/abstractintrospection_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/abstractintrospection_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/abstractintrospection_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/abstractintrospection_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/sdk/abstractintrospection_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/actioneditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/actioneditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/actioneditor_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/actioneditor_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/actioneditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/actionprovider_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/actionprovider_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/actionprovider_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/actionprovider_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/actionprovider_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/actionrepository_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/actionrepository_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/actionrepository_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/actionrepository_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/actionrepository_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/codedialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/codedialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/codedialog_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/codedialog_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/codedialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/connectionedit_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/connectionedit_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/connectionedit_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/connectionedit_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/connectionedit_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/csshighlighter_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/csshighlighter_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/csshighlighter_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/csshighlighter_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/csshighlighter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/deviceprofile_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/deviceprofile_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/deviceprofile_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/deviceprofile_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/deviceprofile_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/dialoggui_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/dialoggui_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/dialoggui_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/dialoggui_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/dialoggui_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/extensionfactory_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/extensionfactory_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/extensionfactory_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/extensionfactory_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/extensionfactory_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/formbuilderextra_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/formbuilderextra_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/formbuilderextra_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/formbuilderextra_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/uilib/formbuilderextra_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/formlayoutmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/formlayoutmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/formlayoutmenu_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/formlayoutmenu_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/formlayoutmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/formwindowbase_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/formwindowbase_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/formwindowbase_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/formwindowbase_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/formwindowbase_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/gridpanel_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/gridpanel_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/gridpanel_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/gridpanel_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/gridpanel_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/grid_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/grid_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/grid_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/grid_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/grid_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/htmlhighlighter_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/htmlhighlighter_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/htmlhighlighter_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/htmlhighlighter_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/htmlhighlighter_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/iconloader_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/iconloader_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/iconloader_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/iconloader_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/iconloader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/iconselector_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/iconselector_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/iconselector_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/iconselector_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/iconselector_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/invisible_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/invisible_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/invisible_widget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/invisible_widget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/invisible_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/layoutinfo_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/layoutinfo_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/layoutinfo_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/layoutinfo_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/layoutinfo_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/layout_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/layout_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/layout_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/layout_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/layout_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/lib_pch.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/lib_pch.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/lib_pch.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/lib_pch.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/lib_pch.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/metadatabase_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/metadatabase_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/metadatabase_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/metadatabase_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/metadatabase_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/morphmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/morphmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/morphmenu_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/morphmenu_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/morphmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/newactiondialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/newactiondialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/newactiondialog_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/newactiondialog_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/newactiondialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/newformwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/newformwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/newformwidget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/newformwidget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/newformwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/orderdialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/orderdialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/orderdialog_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/orderdialog_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/orderdialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/plaintexteditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/plaintexteditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/plaintexteditor_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/plaintexteditor_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/plaintexteditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/plugindialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/plugindialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/plugindialog_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/plugindialog_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/plugindialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/pluginmanager_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/pluginmanager_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/pluginmanager_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/pluginmanager_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/pluginmanager_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/previewconfigurationwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/previewconfigurationwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/previewconfigurationwidget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/previewconfigurationwidget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/previewconfigurationwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/previewmanager_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/previewmanager_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/previewmanager_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/previewmanager_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/previewmanager_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/promotionmodel_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/promotionmodel_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/promotionmodel_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/promotionmodel_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/promotionmodel_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/promotiontaskmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/promotiontaskmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/promotiontaskmenu_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/promotiontaskmenu_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/promotiontaskmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/properties_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/properties_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/properties_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/properties_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/uilib/properties_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/propertylineedit_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/propertylineedit_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/propertylineedit_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/propertylineedit_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/propertylineedit_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command2_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command2_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command2_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command2_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_command2_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_command_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_command_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dnditem_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dnditem_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dnditem_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dnditem_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_dnditem_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dockwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dockwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dockwidget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_dockwidget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_dockwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formbuilder_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formbuilder_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formbuilder_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formbuilder_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_formbuilder_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formeditorcommand_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formeditorcommand_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formeditorcommand_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formeditorcommand_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_formeditorcommand_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowcommand_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowcommand_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowcommand_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowcommand_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_formwindowcommand_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowmanager_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowmanager_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowmanager_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_formwindowmanager_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_formwindowmanager_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_introspection_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_introspection_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_introspection_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_introspection_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_introspection_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_membersheet_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_membersheet_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_membersheet_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_membersheet_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_membersheet_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menubar_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menubar_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menubar_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menubar_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_menubar_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menu_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_menu_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_menu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_objectinspector_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_objectinspector_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_objectinspector_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_objectinspector_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_objectinspector_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotiondialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotiondialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotiondialog_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotiondialog_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_promotiondialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotion_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotion_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotion_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_promotion_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_promotion_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertycommand_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertycommand_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertycommand_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertycommand_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_propertycommand_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertyeditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertyeditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertyeditor_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertyeditor_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_propertyeditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertysheet_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertysheet_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertysheet_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_propertysheet_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_propertysheet_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_qsettings_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_qsettings_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_qsettings_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_qsettings_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_qsettings_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_stackedbox_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_stackedbox_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_stackedbox_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_stackedbox_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_stackedbox_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_tabwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_tabwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_tabwidget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_tabwidget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_tabwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_taskmenu_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_taskmenu_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_taskmenu_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_taskmenu_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_taskmenu_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbar_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbar_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbar_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbar_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_toolbar_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbox_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbox_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbox_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_toolbox_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_toolbox_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_utils_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_utils_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_utils_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_utils_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_utils_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetbox_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetbox_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetbox_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetbox_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_widgetbox_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetitem_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetitem_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetitem_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widgetitem_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_widgetitem_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qdesigner_widget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qdesigner_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qlayout_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qlayout_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qlayout_widget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qlayout_widget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qlayout_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qsimpleresource_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qsimpleresource_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qsimpleresource_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qsimpleresource_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qsimpleresource_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceeditordialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceeditordialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceeditordialog_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceeditordialog_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qtresourceeditordialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qtresourcemodel_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qtresourcemodel_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qtresourcemodel_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qtresourcemodel_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qtresourcemodel_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceview_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceview_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceview_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/qtresourceview_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/qtresourceview_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/rcc_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/rcc_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/rcc_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/rcc_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/rcc_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/resourcebuilder_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/resourcebuilder_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/resourcebuilder_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/resourcebuilder_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/uilib/resourcebuilder_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/richtexteditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/richtexteditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/richtexteditor_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/richtexteditor_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/richtexteditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/shared_enums_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/shared_enums_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/shared_enums_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/shared_enums_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/shared_enums_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/shared_global_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/shared_global_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/shared_global_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/shared_global_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/shared_global_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/shared_settings_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/shared_settings_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/shared_settings_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/shared_settings_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/shared_settings_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/sheet_delegate_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/sheet_delegate_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/sheet_delegate_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/sheet_delegate_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/sheet_delegate_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/signalslotdialog_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/signalslotdialog_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/signalslotdialog_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/signalslotdialog_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/signalslotdialog_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/spacer_widget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/spacer_widget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/spacer_widget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/spacer_widget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/spacer_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/stylesheeteditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/stylesheeteditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/stylesheeteditor_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/stylesheeteditor_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/stylesheeteditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/textbuilder_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/textbuilder_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/textbuilder_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/textbuilder_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/uilib/textbuilder_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/textpropertyeditor_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/textpropertyeditor_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/textpropertyeditor_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/textpropertyeditor_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/textpropertyeditor_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/ui4_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/ui4_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/ui4_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/ui4_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/uilib/ui4_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/widgetdatabase_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/widgetdatabase_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/widgetdatabase_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/widgetdatabase_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/widgetdatabase_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/widgetfactory_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/widgetfactory_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/widgetfactory_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/widgetfactory_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/widgetfactory_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/zoomwidget_p.h qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/zoomwidget_p.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/5.3.0/QtDesigner/private/zoomwidget_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/5.3.0/QtDesigner/private/zoomwidget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/lib/shared/zoomwidget_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/headers.pri qttools-opensource-src-5.3.0/include/QtDesigner/headers.pri
--- qttools-opensource-src-5.2.1/include/QtDesigner/headers.pri 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/headers.pri 2014-05-15 17:12:39.000000000 +0000
@@ -2,3 +2,4 @@
SYNCQT.HEADER_CLASSES = ../../../../include/QtDesigner/QDesignerComponents ../../../../include/QtDesigner/QExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionFactory ../../../../include/QtDesigner/QAbstractExtensionManager ../../../../include/QtDesigner/QExtensionManager ../../../../include/QtDesigner/QDesignerActionEditorInterface ../../../../include/QtDesigner/QDesignerDnDItemInterface ../../../../include/QtDesigner/QDesignerFormEditorInterface ../../../../include/QtDesigner/QDesignerFormEditorPluginInterface ../../../../include/QtDesigner/QDesignerFormWindowInterface ../../../../include/QtDesigner/QDesignerFormWindowCursorInterface ../../../../include/QtDesigner/QDesignerFormWindowManagerInterface ../../../../include/QtDesigner/QDesignerFormWindowToolInterface ../../../../include/QtDesigner/QDesignerIntegrationInterface ../../../../include/QtDesigner/QDesignerIntegration ../../../../include/QtDesigner/QDesignerLanguageExtension ../../../../include/QtDesigner/QDesignerMetaDataBaseItemInterface ../../../../include/QtDesigner/QDesignerMetaDataBaseInterface ../../../../include/QtDesigner/QDesignerNewFormWidgetInterface ../../../../include/QtDesigner/QDesignerObjectInspectorInterface ../../../../include/QtDesigner/QDesignerOptionsPageInterface ../../../../include/QtDesigner/QDesignerPromotionInterface ../../../../include/QtDesigner/QDesignerPropertyEditorInterface ../../../../include/QtDesigner/QDesignerResourceBrowserInterface ../../../../include/QtDesigner/QDesignerSettingsInterface ../../../../include/QtDesigner/QDesignerWidgetBoxInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseItemInterface ../../../../include/QtDesigner/QDesignerWidgetDataBaseInterface ../../../../include/QtDesigner/QDesignerWidgetFactoryInterface ../../../../include/QtDesigner/QDesignerDynamicPropertySheetExtension ../../../../include/QtDesigner/QDesignerExtraInfoExtension ../../../../include/QtDesigner/QDesignerLayoutDecorationExtension ../../../../include/QtDesigner/QDesignerMemberSheetExtension ../../../../include/QtDesigner/QDesignerPropertySheetExtension ../../../../include/QtDesigner/QDesignerTaskMenuExtension ../../../../include/QtDesigner/QAbstractFormBuilder ../../../../include/QtDesigner/QDesignerContainerExtension ../../../../include/QtDesigner/QDesignerCustomWidgetInterface ../../../../include/QtDesigner/QDesignerCustomWidgetCollectionInterface ../../../../include/QtDesigner/QFormBuilder ../../../../include/QtDesigner/QDesignerExportWidget ../../../../include/QtDesigner/QtDesignerVersion
SYNCQT.PRIVATE_HEADER_FILES = lib_pch.h sdk/abstractdialoggui_p.h sdk/abstractintrospection_p.h shared/actioneditor_p.h shared/actionprovider_p.h shared/actionrepository_p.h shared/codedialog_p.h shared/connectionedit_p.h shared/csshighlighter_p.h shared/deviceprofile_p.h shared/dialoggui_p.h shared/extensionfactory_p.h shared/formlayoutmenu_p.h shared/formwindowbase_p.h shared/grid_p.h shared/gridpanel_p.h shared/htmlhighlighter_p.h shared/iconloader_p.h shared/iconselector_p.h shared/invisible_widget_p.h shared/layout_p.h shared/layoutinfo_p.h shared/metadatabase_p.h shared/morphmenu_p.h shared/newactiondialog_p.h shared/newformwidget_p.h shared/orderdialog_p.h shared/plaintexteditor_p.h shared/plugindialog_p.h shared/pluginmanager_p.h shared/previewconfigurationwidget_p.h shared/previewmanager_p.h shared/promotionmodel_p.h shared/promotiontaskmenu_p.h shared/propertylineedit_p.h shared/qdesigner_command2_p.h shared/qdesigner_command_p.h shared/qdesigner_dnditem_p.h shared/qdesigner_dockwidget_p.h shared/qdesigner_formbuilder_p.h shared/qdesigner_formeditorcommand_p.h shared/qdesigner_formwindowcommand_p.h shared/qdesigner_formwindowmanager_p.h shared/qdesigner_introspection_p.h shared/qdesigner_membersheet_p.h shared/qdesigner_menu_p.h shared/qdesigner_menubar_p.h shared/qdesigner_objectinspector_p.h shared/qdesigner_promotion_p.h shared/qdesigner_promotiondialog_p.h shared/qdesigner_propertycommand_p.h shared/qdesigner_propertyeditor_p.h shared/qdesigner_propertysheet_p.h shared/qdesigner_qsettings_p.h shared/qdesigner_stackedbox_p.h shared/qdesigner_tabwidget_p.h shared/qdesigner_taskmenu_p.h shared/qdesigner_toolbar_p.h shared/qdesigner_toolbox_p.h shared/qdesigner_utils_p.h shared/qdesigner_widget_p.h shared/qdesigner_widgetbox_p.h shared/qdesigner_widgetitem_p.h shared/qlayout_widget_p.h shared/qsimpleresource_p.h shared/qtresourceeditordialog_p.h shared/qtresourcemodel_p.h shared/qtresourceview_p.h shared/rcc_p.h shared/richtexteditor_p.h shared/shared_enums_p.h shared/shared_global_p.h shared/shared_settings_p.h shared/sheet_delegate_p.h shared/signalslotdialog_p.h shared/spacer_widget_p.h shared/stylesheeteditor_p.h shared/textpropertyeditor_p.h shared/widgetdatabase_p.h shared/widgetfactory_p.h shared/zoomwidget_p.h uilib/formbuilderextra_p.h uilib/properties_p.h uilib/resourcebuilder_p.h uilib/textbuilder_p.h uilib/ui4_p.h
SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -Nru qttools-opensource-src-5.2.1/include/QtDesigner/qtdesignerversion.h qttools-opensource-src-5.3.0/include/QtDesigner/qtdesignerversion.h
--- qttools-opensource-src-5.2.1/include/QtDesigner/qtdesignerversion.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesigner/qtdesignerversion.h 2014-05-15 17:12:39.000000000 +0000
@@ -2,8 +2,8 @@
#ifndef QT_QTDESIGNER_VERSION_H
#define QT_QTDESIGNER_VERSION_H
-#define QTDESIGNER_VERSION_STR "5.2.1"
+#define QTDESIGNER_VERSION_STR "5.3.0"
-#define QTDESIGNER_VERSION 0x050201
+#define QTDESIGNER_VERSION 0x050300
#endif // QT_QTDESIGNER_VERSION_H
diff -Nru qttools-opensource-src-5.2.1/include/QtDesignerComponents/5.2.1/QtDesignerComponents/private/lib_pch.h qttools-opensource-src-5.3.0/include/QtDesignerComponents/5.2.1/QtDesignerComponents/private/lib_pch.h
--- qttools-opensource-src-5.2.1/include/QtDesignerComponents/5.2.1/QtDesignerComponents/private/lib_pch.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesignerComponents/5.2.1/QtDesignerComponents/private/lib_pch.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/components/lib/lib_pch.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesignerComponents/5.3.0/QtDesignerComponents/private/lib_pch.h qttools-opensource-src-5.3.0/include/QtDesignerComponents/5.3.0/QtDesignerComponents/private/lib_pch.h
--- qttools-opensource-src-5.2.1/include/QtDesignerComponents/5.3.0/QtDesignerComponents/private/lib_pch.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesignerComponents/5.3.0/QtDesignerComponents/private/lib_pch.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/components/lib/lib_pch.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtDesignerComponents/headers.pri qttools-opensource-src-5.3.0/include/QtDesignerComponents/headers.pri
--- qttools-opensource-src-5.2.1/include/QtDesignerComponents/headers.pri 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesignerComponents/headers.pri 2014-05-15 17:12:39.000000000 +0000
@@ -2,3 +2,4 @@
SYNCQT.HEADER_CLASSES = ../../../../../include/QtDesignerComponents/QtDesignerComponentsVersion
SYNCQT.PRIVATE_HEADER_FILES = lib_pch.h
SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -Nru qttools-opensource-src-5.2.1/include/QtDesignerComponents/qtdesignercomponentsversion.h qttools-opensource-src-5.3.0/include/QtDesignerComponents/qtdesignercomponentsversion.h
--- qttools-opensource-src-5.2.1/include/QtDesignerComponents/qtdesignercomponentsversion.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtDesignerComponents/qtdesignercomponentsversion.h 2014-05-15 17:12:39.000000000 +0000
@@ -2,8 +2,8 @@
#ifndef QT_QTDESIGNERCOMPONENTS_VERSION_H
#define QT_QTDESIGNERCOMPONENTS_VERSION_H
-#define QTDESIGNERCOMPONENTS_VERSION_STR "5.2.1"
+#define QTDESIGNERCOMPONENTS_VERSION_STR "5.3.0"
-#define QTDESIGNERCOMPONENTS_VERSION 0x050201
+#define QTDESIGNERCOMPONENTS_VERSION 0x050300
#endif // QT_QTDESIGNERCOMPONENTS_VERSION_H
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qclucenefieldnames_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qclucenefieldnames_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qclucenefieldnames_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qclucenefieldnames_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qclucenefieldnames_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpcollectionhandler_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpcollectionhandler_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpcollectionhandler_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpcollectionhandler_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpcollectionhandler_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpdatainterface_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpdatainterface_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpdatainterface_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpdatainterface_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpdatainterface_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpdbreader_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpdbreader_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpdbreader_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpdbreader_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpdbreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpengine_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpengine_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpengine_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpengine_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpengine_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpgenerator_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpgenerator_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpgenerator_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpgenerator_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpgenerator_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpprojectdata_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpprojectdata_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpprojectdata_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpprojectdata_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpprojectdata_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindex_default_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindex_default_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindex_default_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindex_default_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpsearchindex_default_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_clucene_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_clucene_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_clucene_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_clucene_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpsearchindexreader_clucene_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_default_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_default_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_default_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_default_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpsearchindexreader_default_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexreader_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpsearchindexreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_clucene_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_clucene_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_clucene_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_clucene_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpsearchindexwriter_clucene_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_default_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_default_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_default_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.2.1/QtHelp/private/qhelpsearchindexwriter_default_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/assistant/help/qhelpsearchindexwriter_default_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qclucenefieldnames_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qclucenefieldnames_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qclucenefieldnames_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qclucenefieldnames_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qclucenefieldnames_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpcollectionhandler_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpcollectionhandler_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpcollectionhandler_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpcollectionhandler_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpcollectionhandler_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpdatainterface_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpdatainterface_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpdatainterface_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpdatainterface_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpdatainterface_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpdbreader_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpdbreader_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpdbreader_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpdbreader_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpdbreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpengine_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpengine_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpengine_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpengine_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpengine_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpgenerator_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpgenerator_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpgenerator_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpgenerator_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpgenerator_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpprojectdata_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpprojectdata_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpprojectdata_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpprojectdata_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpprojectdata_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindex_default_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindex_default_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindex_default_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindex_default_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpsearchindex_default_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_clucene_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_clucene_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_clucene_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_clucene_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpsearchindexreader_clucene_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_default_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_default_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_default_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_default_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpsearchindexreader_default_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexreader_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpsearchindexreader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_clucene_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_clucene_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_clucene_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_clucene_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpsearchindexwriter_clucene_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_default_p.h qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_default_p.h
--- qttools-opensource-src-5.2.1/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_default_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/5.3.0/QtHelp/private/qhelpsearchindexwriter_default_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/assistant/help/qhelpsearchindexwriter_default_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/headers.pri qttools-opensource-src-5.3.0/include/QtHelp/headers.pri
--- qttools-opensource-src-5.2.1/include/QtHelp/headers.pri 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/headers.pri 2014-05-15 17:12:39.000000000 +0000
@@ -2,3 +2,4 @@
SYNCQT.HEADER_CLASSES = ../../../include/QtHelp/QHelpGlobal ../../../include/QtHelp/QHelpContentItem ../../../include/QtHelp/QHelpContentModel ../../../include/QtHelp/QHelpContentWidget ../../../include/QtHelp/QHelpEngine ../../../include/QtHelp/QHelpEngineCore ../../../include/QtHelp/QHelpIndexModel ../../../include/QtHelp/QHelpIndexWidget ../../../include/QtHelp/QHelpSearchQuery ../../../include/QtHelp/QHelpSearchEngine ../../../include/QtHelp/QHelpSearchQueryWidget ../../../include/QtHelp/QHelpSearchResultWidget ../../../include/QtHelp/QtHelpVersion
SYNCQT.PRIVATE_HEADER_FILES = qclucenefieldnames_p.h qhelpcollectionhandler_p.h qhelpdatainterface_p.h qhelpdbreader_p.h qhelpengine_p.h qhelpgenerator_p.h qhelpprojectdata_p.h qhelpsearchindex_default_p.h qhelpsearchindexreader_clucene_p.h qhelpsearchindexreader_default_p.h qhelpsearchindexreader_p.h qhelpsearchindexwriter_clucene_p.h qhelpsearchindexwriter_default_p.h
SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -Nru qttools-opensource-src-5.2.1/include/QtHelp/qthelpversion.h qttools-opensource-src-5.3.0/include/QtHelp/qthelpversion.h
--- qttools-opensource-src-5.2.1/include/QtHelp/qthelpversion.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtHelp/qthelpversion.h 2014-05-15 17:12:39.000000000 +0000
@@ -2,8 +2,8 @@
#ifndef QT_QTHELP_VERSION_H
#define QT_QTHELP_VERSION_H
-#define QTHELP_VERSION_STR "5.2.1"
+#define QTHELP_VERSION_STR "5.3.0"
-#define QTHELP_VERSION 0x050201
+#define QTHELP_VERSION 0x050300
#endif // QT_QTHELP_VERSION_H
diff -Nru qttools-opensource-src-5.2.1/include/QtUiTools/5.2.1/QtUiTools/private/quiloader_p.h qttools-opensource-src-5.3.0/include/QtUiTools/5.2.1/QtUiTools/private/quiloader_p.h
--- qttools-opensource-src-5.2.1/include/QtUiTools/5.2.1/QtUiTools/private/quiloader_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtUiTools/5.2.1/QtUiTools/private/quiloader_p.h 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-#include "../../../../../src/designer/src/uitools/quiloader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtUiTools/5.3.0/QtUiTools/private/quiloader_p.h qttools-opensource-src-5.3.0/include/QtUiTools/5.3.0/QtUiTools/private/quiloader_p.h
--- qttools-opensource-src-5.2.1/include/QtUiTools/5.3.0/QtUiTools/private/quiloader_p.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtUiTools/5.3.0/QtUiTools/private/quiloader_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1 @@
+#include "../../../../../src/designer/src/uitools/quiloader_p.h"
diff -Nru qttools-opensource-src-5.2.1/include/QtUiTools/headers.pri qttools-opensource-src-5.3.0/include/QtUiTools/headers.pri
--- qttools-opensource-src-5.2.1/include/QtUiTools/headers.pri 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtUiTools/headers.pri 2014-05-15 17:12:39.000000000 +0000
@@ -2,3 +2,4 @@
SYNCQT.HEADER_CLASSES = ../../../../include/QtUiTools/QUiLoader ../../../../include/QtUiTools/QtUiToolsVersion
SYNCQT.PRIVATE_HEADER_FILES = quiloader_p.h
SYNCQT.QPA_HEADER_FILES =
+SYNCQT.INJECTIONS =
diff -Nru qttools-opensource-src-5.2.1/include/QtUiTools/qtuitoolsversion.h qttools-opensource-src-5.3.0/include/QtUiTools/qtuitoolsversion.h
--- qttools-opensource-src-5.2.1/include/QtUiTools/qtuitoolsversion.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/include/QtUiTools/qtuitoolsversion.h 2014-05-15 17:12:39.000000000 +0000
@@ -2,8 +2,8 @@
#ifndef QT_QTUITOOLS_VERSION_H
#define QT_QTUITOOLS_VERSION_H
-#define QTUITOOLS_VERSION_STR "5.2.1"
+#define QTUITOOLS_VERSION_STR "5.3.0"
-#define QTUITOOLS_VERSION 0x050201
+#define QTUITOOLS_VERSION 0x050300
#endif // QT_QTUITOOLS_VERSION_H
diff -Nru qttools-opensource-src-5.2.1/.qmake.conf qttools-opensource-src-5.3.0/.qmake.conf
--- qttools-opensource-src-5.2.1/.qmake.conf 2014-02-01 20:37:56.000000000 +0000
+++ qttools-opensource-src-5.3.0/.qmake.conf 2014-05-15 17:12:38.000000000 +0000
@@ -1,4 +1,4 @@
load(qt_build_config)
CONFIG += qt_example_installs
-MODULE_VERSION = 5.2.1
+MODULE_VERSION = 5.3.0
diff -Nru qttools-opensource-src-5.2.1/src/androiddeployqt/main.cpp qttools-opensource-src-5.3.0/src/androiddeployqt/main.cpp
--- qttools-opensource-src-5.2.1/src/androiddeployqt/main.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/androiddeployqt/main.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -73,12 +73,24 @@
QDir().rmdir(dirName);
}
+FILE *openProcess(const QString &command)
+{
+#if defined(Q_OS_WIN32)
+ QString processedCommand = QLatin1Char('\"') + command + QLatin1Char('\"');
+#else
+ QString processedCommand = command;
+#endif
+
+ return popen(processedCommand.toLocal8Bit().constData(), "r");
+}
+
struct Options
{
Options()
: helpRequested(false)
, verbose(false)
, timing(false)
+ , generateAssetsFileList(true)
, minimumAndroidVersion(9)
, targetAndroidVersion(10)
, deploymentMechanism(Bundled)
@@ -108,6 +120,7 @@
bool helpRequested;
bool verbose;
bool timing;
+ bool generateAssetsFileList;
QTime timer;
// External tools
@@ -300,6 +313,8 @@
options.sectionsOnly = true;
} else if (argument.compare(QLatin1String("--protected"), Qt::CaseInsensitive) == 0) {
options.protectedAuthenticationPath = true;
+ } else if (argument.compare(QLatin1String("--no-generated-assets-cache"), Qt::CaseInsensitive) == 0) {
+ options.generateAssetsFileList = false;
}
}
@@ -333,7 +348,7 @@
" platform. By default, the highest available version will be\n"
" used.\n"
" --ant : If unspecified, ant from the PATH will be\n"
- " used."
+ " used.\n"
" --release: Builds a package ready for release. By default, the\n"
" package will be signed with a debug key.\n"
" --sign : Signs the package with the\n"
@@ -359,6 +374,8 @@
" an attempt is made to detect the tool using the JAVA_HOME and\n"
" PATH environment variables, in that order.\n"
" --verbose: Prints out information during processing.\n"
+ " --no-generated-assets-cache: Do not pregenerate the entry list for\n"
+ " the assets file engine.\n"
" --help: Displays this information.\n\n",
qPrintable(QCoreApplication::arguments().at(0))
);
@@ -388,13 +405,18 @@
|| fileName.endsWith(QLatin1String("/src/org/qtproject/qt5/android/bindings/QtActivity.java")));
}
-bool copyFileIfNewer(const QString &sourceFileName, const QString &destinationFileName, bool verbose)
+bool copyFileIfNewer(const QString &sourceFileName,
+ const QString &destinationFileName,
+ bool verbose,
+ bool forceOverwrite = false)
{
if (QFile::exists(destinationFileName)) {
QFileInfo destinationFileInfo(destinationFileName);
QFileInfo sourceFileInfo(sourceFileName);
- if (sourceFileInfo.lastModified() <= destinationFileInfo.lastModified() && !alwaysOverwritableFile(destinationFileName)) {
+ if (!forceOverwrite
+ && sourceFileInfo.lastModified() <= destinationFileInfo.lastModified()
+ && !alwaysOverwritableFile(destinationFileName)) {
if (verbose)
fprintf(stdout, " -- Skipping file %s. Same or newer file already in place.\n", qPrintable(sourceFileName));
return true;
@@ -460,8 +482,9 @@
QString word = packageName.mid(index + 1, next - index - 1);
if (!word.isEmpty()) {
QChar c = word[0];
- if (c >= QChar(QLatin1Char('0')) && c<= QChar(QLatin1Char('9'))) {
- packageName.insert(index + 1, QLatin1Char('_'));
+ if ((c >= QChar(QLatin1Char('0')) && c<= QChar(QLatin1Char('9')))
+ || c == QLatin1Char('_')) {
+ packageName.insert(index + 1, QLatin1Char('a'));
index = next + 1;
continue;
}
@@ -636,7 +659,7 @@
return true;
}
-bool copyFiles(const QDir &sourceDirectory, const QDir &destinationDirectory, bool verbose)
+bool copyFiles(const QDir &sourceDirectory, const QDir &destinationDirectory, bool verbose, bool forceOverwrite = false)
{
QFileInfoList entries = sourceDirectory.entryInfoList(QDir::NoDotAndDotDot | QDir::Files | QDir::Dirs);
foreach (QFileInfo entry, entries) {
@@ -647,11 +670,11 @@
return false;
}
- if (!copyFiles(dir, QDir(destinationDirectory.path() + QLatin1String("/") + dir.dirName()), verbose))
+ if (!copyFiles(dir, QDir(destinationDirectory.path() + QLatin1String("/") + dir.dirName()), verbose, forceOverwrite))
return false;
} else {
QString destination = destinationDirectory.absoluteFilePath(entry.fileName());
- if (!copyFileIfNewer(entry.absoluteFilePath(), destination, verbose))
+ if (!copyFileIfNewer(entry.absoluteFilePath(), destination, verbose, forceOverwrite))
return false;
}
}
@@ -692,7 +715,7 @@
return false;
}
- return copyFiles(sourceDirectory, QDir(options.outputDirectory), options.verbose);
+ return copyFiles(sourceDirectory, QDir(options.outputDirectory), options.verbose, true);
}
bool copyAndroidExtraLibs(const Options &options)
@@ -857,8 +880,9 @@
}
bool usesGL = false;
- foreach (QString localLib, localLibs) {
- if (localLib.endsWith(QLatin1String("libqtforandroidGL.so"))) {
+ foreach (QString qtDependency, options.qtDependencies) {
+ if (qtDependency.endsWith(QLatin1String("libQt5OpenGL.so"))
+ || qtDependency.endsWith(QLatin1String("libQt5Quick.so"))) {
usesGL = true;
break;
}
@@ -877,14 +901,14 @@
QString permissions;
foreach (QString permission, options.permissions)
- permissions += QString::fromLatin1("\n").arg(permission);
+ permissions += QString::fromLatin1(" \n").arg(permission);
replacements[QLatin1String("")] = permissions;
QString features;
foreach (QString feature, options.features)
- features += QString::fromLatin1("\n").arg(feature);
+ features += QStringLiteral(" \n").arg(feature);
if (usesGL)
- features += QStringLiteral("");
+ features += QStringLiteral(" ");
replacements[QLatin1String("")] = features;
@@ -1174,7 +1198,7 @@
readElf = QString::fromLatin1("\"%1\" -d -W %2").arg(readElf).arg(fileName);
- FILE *readElfCommand = popen(readElf.toLocal8Bit().constData(), "r");
+ FILE *readElfCommand = openProcess(readElf);
if (readElfCommand == 0) {
fprintf(stderr, "Cannot execute command %s", qPrintable(readElf));
return QStringList();
@@ -1263,7 +1287,7 @@
while (!remainingDependencies.isEmpty()) {
QSet::iterator start = remainingDependencies.begin();
- QString fileName = qtDir+*start;
+ QString fileName = qtDir + *start;
remainingDependencies.erase(start);
QStringList unmetDependencies;
@@ -1277,6 +1301,21 @@
qPrintable(unmetDependencies.join(QLatin1Char(','))));
}
}
+
+ QStringList::iterator it = options->localLibs.begin();
+ while (it != options->localLibs.end()) {
+ QStringList unmetDependencies;
+ if (!goodToCopy(options, qtDir + *it, &unmetDependencies)) {
+ if (options->verbose) {
+ fprintf(stdout, "Skipping %s due to unmet dependencies: %s\n",
+ qPrintable(*it),
+ qPrintable(unmetDependencies.join(QLatin1Char(','))));
+ }
+ it = options->localLibs.erase(it);
+ } else {
+ ++it;
+ }
+ }
return true;
}
@@ -1303,7 +1342,7 @@
strip = QString::fromLatin1("\"%1\" %2").arg(strip).arg(fileName);
- FILE *stripCommand = popen(strip.toLocal8Bit().constData(), "r");
+ FILE *stripCommand = openProcess(strip);
if (stripCommand == 0) {
fprintf(stderr, "Cannot execute command %s", qPrintable(strip));
return false;
@@ -1384,7 +1423,7 @@
if (options.verbose)
fprintf(stdout, "Running command \"%s\"\n", adb.toLocal8Bit().constData());
- FILE *adbCommand = popen(adb.toLocal8Bit().constData(), "r");
+ FILE *adbCommand = openProcess(adb);
if (adbCommand == 0) {
fprintf(stderr, "Cannot start adb: %s\n", qPrintable(adb));
return 0;
@@ -1520,6 +1559,8 @@
// For debug deployment, we copy all libraries and plugins
QDirIterator dirIterator(options->qtInstallDirectory, QDirIterator::Subdirectories);
while (dirIterator.hasNext()) {
+ dirIterator.next();
+
QFileInfo info = dirIterator.fileInfo();
if (!info.isDir()) {
QString relativePath = info.absoluteFilePath().mid(options->qtInstallDirectory.length());
@@ -1535,7 +1576,6 @@
return false;
}
}
- dirIterator.next();
}
foreach (QString qtDependency, options->qtDependencies)
@@ -1619,7 +1659,7 @@
if (options.verbose)
fprintf(stdout, " -- Command: %s\n", qPrintable(androidTool));
- FILE *androidToolCommand = popen(androidTool.toLocal8Bit().constData(), "r");
+ FILE *androidToolCommand = openProcess(androidTool);
if (androidToolCommand == 0) {
fprintf(stderr, "Cannot run command '%s'\n", qPrintable(androidTool));
return false;
@@ -1679,7 +1719,7 @@
QString ant = QString::fromLatin1("\"%1\" %2").arg(antTool).arg(options.releasePackage ? QLatin1String(" release") : QLatin1String(" debug"));
- FILE *antCommand = popen(ant.toLocal8Bit().constData(), "r");
+ FILE *antCommand = openProcess(ant);
if (antCommand == 0) {
fprintf(stderr, "Cannot run ant command: %s\n.", qPrintable(ant));
return false;
@@ -1836,29 +1876,29 @@
return false;
}
- jarSignerTool = QString::fromLatin1("\"%1\" -sigalg %2 -digestalg %3 -keystore %4")
+ jarSignerTool = QString::fromLatin1("\"%1\" -sigalg \"%2\" -digestalg \"%3\" -keystore \"%4\"")
.arg(jarSignerTool).arg(options.sigAlg).arg(options.digestAlg).arg(options.keyStore);
if (!options.keyStorePassword.isEmpty())
- jarSignerTool += QString::fromLatin1(" -storepass %1").arg(options.keyStorePassword);
+ jarSignerTool += QString::fromLatin1(" -storepass \"%1\"").arg(options.keyStorePassword);
if (!options.storeType.isEmpty())
- jarSignerTool += QString::fromLatin1(" -storetype %1").arg(options.storeType);
+ jarSignerTool += QString::fromLatin1(" -storetype \"%1\"").arg(options.storeType);
if (!options.keyPass.isEmpty())
- jarSignerTool += QString::fromLatin1(" -keypass %1").arg(options.keyPass);
+ jarSignerTool += QString::fromLatin1(" -keypass \"%1\"").arg(options.keyPass);
if (!options.sigFile.isEmpty())
- jarSignerTool += QString::fromLatin1(" -sigfile %1").arg(options.sigFile);
+ jarSignerTool += QString::fromLatin1(" -sigfile \"%1\"").arg(options.sigFile);
if (!options.signedJar.isEmpty())
- jarSignerTool += QString::fromLatin1(" -signedjar %1").arg(options.signedJar);
+ jarSignerTool += QString::fromLatin1(" -signedjar \"%1\"").arg(options.signedJar);
if (!options.tsaUrl.isEmpty())
- jarSignerTool += QString::fromLatin1(" -tsa %1").arg(options.tsaUrl);
+ jarSignerTool += QString::fromLatin1(" -tsa \"%1\"").arg(options.tsaUrl);
if (!options.tsaCert.isEmpty())
- jarSignerTool += QString::fromLatin1(" -tsacert %1").arg(options.tsaCert);
+ jarSignerTool += QString::fromLatin1(" -tsacert \"%1\"").arg(options.tsaCert);
if (options.internalSf)
jarSignerTool += QLatin1String(" -internalsf");
@@ -1869,14 +1909,14 @@
if (options.protectedAuthenticationPath)
jarSignerTool += QLatin1String(" -protected");
- jarSignerTool += QString::fromLatin1(" %1 %2")
+ jarSignerTool += QString::fromLatin1(" %1 \"%2\"")
.arg(options.outputDirectory
+ QLatin1String("/bin/")
+ apkName(options)
+ QLatin1String("-unsigned.apk"))
.arg(options.keyStoreAlias);
- FILE *jarSignerCommand = popen(jarSignerTool.toLocal8Bit().constData(), "r");
+ FILE *jarSignerCommand = openProcess(jarSignerTool);
if (jarSignerCommand == 0) {
fprintf(stderr, "Couldn't run jarsigner.\n");
return false;
@@ -1918,7 +1958,7 @@
+ apkName(options)
+ QLatin1String(".apk"));
- FILE *zipAlignCommand = popen(zipAlignTool.toLocal8Bit(), "r");
+ FILE *zipAlignCommand = openProcess(zipAlignTool);
if (zipAlignCommand == 0) {
fprintf(stderr, "Couldn't run zipalign.\n");
return false;
@@ -1975,7 +2015,7 @@
{
FILE *adbCommand = runAdb(options,
QString::fromLatin1(" push %1 /data/local/tmp/qt/")
- .arg(options.temporaryDirectoryName + QLatin1Char('/')));
+ .arg(options.temporaryDirectoryName));
if (adbCommand == 0)
return false;
@@ -1995,6 +2035,58 @@
return true;
}
+bool generateAssetsFileList(const Options &options)
+{
+ if (options.verbose)
+ fprintf(stdout, "Pregenerating entry list for assets file engine.\n");
+
+ QString assetsPath = options.outputDirectory + QLatin1String("/assets/");
+ QString addedByAndroidDeployQtPath = assetsPath + QLatin1String("--Added-by-androiddeployqt--/");
+ if (!QDir().mkpath(addedByAndroidDeployQtPath)) {
+ fprintf(stderr, "Failed to create directory '%s'", qPrintable(addedByAndroidDeployQtPath));
+ return false;
+ }
+
+ QFile file(addedByAndroidDeployQtPath + QLatin1String("/qt_cache_pregenerated_file_list"));
+ if (file.open(QIODevice::WriteOnly)) {
+ QDirIterator dirIterator(assetsPath,
+ QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot,
+ QDirIterator::Subdirectories);
+
+ QHash directoryContents;
+ while (dirIterator.hasNext()) {
+ const QString name = dirIterator.next().mid(assetsPath.length());
+
+ int slashIndex = name.lastIndexOf(QLatin1Char('/'));
+ QString pathName = slashIndex >= 0 ? name.left(slashIndex) : QString::fromLatin1("/");
+ QString fileName = slashIndex >= 0 ? name.mid(pathName.length() + 1) : name;
+
+ if (!fileName.isEmpty() && dirIterator.fileInfo().isDir() && !fileName.endsWith(QLatin1Char('/')))
+ fileName += QLatin1Char('/');
+
+ if (fileName.isEmpty() && !directoryContents.contains(pathName))
+ directoryContents[pathName] = QStringList();
+ else if (!fileName.isEmpty())
+ directoryContents[pathName].append(fileName);
+ }
+
+ QDataStream stream(&file);
+ stream.setVersion(QDataStream::Qt_5_3);
+ QList directories = directoryContents.keys();
+ foreach (const QString &directory, directories) {
+ QStringList entryList = directoryContents.value(directory);
+ stream << directory << entryList.size();
+ foreach (const QString &entry, entryList)
+ stream << entry;
+ }
+ } else {
+ fprintf(stderr, "Pregenerating entry list for assets file engine failed!\n");
+ return false;
+ }
+
+ return true;
+}
+
enum ErrorCode
{
Success,
@@ -2014,7 +2106,8 @@
CannotBuildAndroidProject = 14,
CannotSignPackage = 15,
CannotInstallApk = 16,
- CannotDeployAllToLocalTmp = 17
+ CannotDeployAllToLocalTmp = 17,
+ CannotGenerateAssetsFileList = 18
};
int main(int argc, char *argv[])
@@ -2113,6 +2206,9 @@
if (!updateAndroidFiles(options))
return CannotUpdateAndroidFiles;
+ if (options.generateAssetsFileList && !generateAssetsFileList(options))
+ return CannotGenerateAssetsFileList;
+
if (Q_UNLIKELY(options.timing))
fprintf(stdout, "[TIMING] %d ms: Updated files\n", options.timer.elapsed());
diff -Nru qttools-opensource-src-5.2.1/src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h qttools-opensource-src-5.3.0/src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h
--- qttools-opensource-src-5.2.1/src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/3rdparty/clucene/src/CLucene/config/threadCSection.h 2014-05-15 17:12:40.000000000 +0000
@@ -62,6 +62,9 @@
}
};
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
+ #define Sleep(x) WaitForSingleObjectEx(GetCurrentThread(), x, FALSE)
+#endif
#define _LUCENE_SLEEP(x) Sleep(x)
#define _LUCENE_THREADMUTEX CL_NS(util)::mutex_win32
#define _LUCENE_CURRTHREADID GetCurrentThreadId()
diff -Nru qttools-opensource-src-5.2.1/src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp qttools-opensource-src-5.3.0/src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp
--- qttools-opensource-src-5.2.1/src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/3rdparty/clucene/src/CLucene/config/threads.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -41,20 +41,31 @@
//we have not explicity included windows.h and windows.h has
//not been included (check _WINDOWS_), then we must define
//our own definitions to the thread locking functions:
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
+ extern "C" __declspec(dllimport) void __stdcall InitializeCriticalSectionEx(CRITICAL_SECTION *, DWORD, DWORD);
+#else
extern "C" __declspec(dllimport) void __stdcall InitializeCriticalSection(CRITICAL_SECTION *);
+#endif
extern "C" __declspec(dllimport) void __stdcall EnterCriticalSection(CRITICAL_SECTION *);
extern "C" __declspec(dllimport) void __stdcall LeaveCriticalSection(CRITICAL_SECTION *);
extern "C" __declspec(dllimport) void __stdcall DeleteCriticalSection(CRITICAL_SECTION *);
extern "C" __declspec(dllimport) unsigned long __stdcall GetCurrentThreadId();
#endif
-
mutex_win32::mutex_win32(const mutex_win32& clone){
- InitializeCriticalSection(&mtx);
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
+ InitializeCriticalSectionEx(&mtx, 0, 0);
+#else
+ InitializeCriticalSection(&mtx);
+#endif
}
mutex_win32::mutex_win32()
{
- InitializeCriticalSection(&mtx);
- }
+#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP || WINAPI_FAMILY==WINAPI_FAMILY_PHONE_APP)
+ InitializeCriticalSectionEx(&mtx, 0, 0);
+#else
+ InitializeCriticalSection(&mtx);
+#endif
+ }
mutex_win32::~mutex_win32()
{
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/aboutdialog.h qttools-opensource-src-5.3.0/src/assistant/assistant/aboutdialog.h
--- qttools-opensource-src-5.2.1/src/assistant/assistant/aboutdialog.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/aboutdialog.h 2014-05-15 17:12:40.000000000 +0000
@@ -59,7 +59,7 @@
AboutLabel(QWidget *parent = 0);
void setText(const QString &text, const QByteArray &resources);
QSize minimumSizeHint() const;
-
+
private:
QVariant loadResource(int type, const QUrl &name);
void setSource(const QUrl &url);
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/bookmarkfiltermodel.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/bookmarkfiltermodel.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/bookmarkfiltermodel.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/bookmarkfiltermodel.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -55,15 +55,15 @@
beginResetModel();
if (sourceModel) {
- disconnect(sourceModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)),
- this, SLOT(changed(QModelIndex, QModelIndex)));
- disconnect(sourceModel, SIGNAL(rowsInserted(QModelIndex, int, int)),
- this, SLOT(rowsInserted(QModelIndex, int, int)));
+ disconnect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
+ this, SLOT(changed(QModelIndex,QModelIndex)));
+ disconnect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(rowsInserted(QModelIndex,int,int)));
disconnect(sourceModel,
- SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)), this,
- SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
- disconnect(sourceModel, SIGNAL(rowsRemoved(QModelIndex, int, int)),
- this, SLOT(rowsRemoved(QModelIndex, int, int)));
+ SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this,
+ SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
+ disconnect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)),
+ this, SLOT(rowsRemoved(QModelIndex,int,int)));
disconnect(sourceModel, SIGNAL(layoutAboutToBeChanged()), this,
SLOT(layoutAboutToBeChanged()));
disconnect(sourceModel, SIGNAL(layoutChanged()), this,
@@ -76,16 +76,16 @@
QAbstractProxyModel::setSourceModel(sourceModel);
sourceModel = qobject_cast (_sourceModel);
- connect(sourceModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
- SLOT(changed(QModelIndex, QModelIndex)));
+ connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
+ SLOT(changed(QModelIndex,QModelIndex)));
- connect(sourceModel, SIGNAL(rowsInserted(QModelIndex, int, int)),
- this, SLOT(rowsInserted(QModelIndex, int, int)));
+ connect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)),
+ this, SLOT(rowsInserted(QModelIndex,int,int)));
- connect(sourceModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex, int, int)),
- this, SLOT(rowsAboutToBeRemoved(QModelIndex, int, int)));
- connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
- SLOT(rowsRemoved(QModelIndex, int, int)));
+ connect(sourceModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)),
+ this, SLOT(rowsAboutToBeRemoved(QModelIndex,int,int)));
+ connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
+ SLOT(rowsRemoved(QModelIndex,int,int)));
connect(sourceModel, SIGNAL(layoutAboutToBeChanged()), this,
SLOT(layoutAboutToBeChanged()));
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/bookmarkmanager.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/bookmarkmanager.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/bookmarkmanager.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/bookmarkmanager.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -196,18 +196,18 @@
connect(&HelpEngineWrapper::instance(), SIGNAL(setupFinished()), this,
SLOT(setupFinished()));
- connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
+ connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
SLOT(refreshBookmarkMenu()));
- connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this,
+ connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this,
SLOT(refreshBookmarkMenu()));
- connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
+ connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
SLOT(refreshBookmarkMenu()));
- connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
+ connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
SLOT(refreshBookmarkToolBar()));
- connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this,
+ connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this,
SLOT(refreshBookmarkToolBar()));
- connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
+ connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
SLOT(refreshBookmarkToolBar()));
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/bookmarkmanagerwidget.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/bookmarkmanagerwidget.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/bookmarkmanagerwidget.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/bookmarkmanagerwidget.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -86,11 +86,11 @@
new QShortcut(QKeySequence::FindNext, this, SLOT(findNext()));
new QShortcut(QKeySequence::FindPrevious, this, SLOT(findPrevious()));
- connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex, int, int)), this,
+ connect(bookmarkModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this,
SLOT(refeshBookmarkCache()));
- connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex, int, int)), this,
+ connect(bookmarkModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this,
SLOT(refeshBookmarkCache()));
- connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex, QModelIndex)), this,
+ connect(bookmarkModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)), this,
SLOT(refeshBookmarkCache()));
ui.treeView->setCurrentIndex(ui.treeView->indexAt(QPoint(2, 2)));
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/centralwidget.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/centralwidget.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/centralwidget.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/centralwidget.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -213,11 +213,11 @@
connect(m_findWidget, SIGNAL(findNext()), this, SLOT(findNext()));
connect(m_findWidget, SIGNAL(findPrevious()), this, SLOT(findPrevious()));
- connect(m_findWidget, SIGNAL(find(QString, bool, bool)), this,
- SLOT(find(QString, bool, bool)));
+ connect(m_findWidget, SIGNAL(find(QString,bool,bool)), this,
+ SLOT(find(QString,bool,bool)));
connect(m_findWidget, SIGNAL(escapePressed()), this, SLOT(activateTab()));
- connect(m_tabBar, SIGNAL(addBookmark(QString, QString)), this,
- SIGNAL(addBookmark(QString, QString)));
+ connect(m_tabBar, SIGNAL(addBookmark(QString,QString)), this,
+ SIGNAL(addBookmark(QString,QString)));
}
CentralWidget::~CentralWidget()
@@ -616,6 +616,8 @@
{
TRACE_OBJ
#if !defined(QT_NO_WEBKIT)
+ connect(page, SIGNAL(printRequested()), this, SLOT(print()));
+#endif
connect(page, SIGNAL(copyAvailable(bool)), this,
SIGNAL(copyAvailable(bool)));
connect(page, SIGNAL(forwardAvailable(bool)), this,
@@ -624,11 +626,7 @@
SIGNAL(backwardAvailable(bool)));
connect(page, SIGNAL(sourceChanged(QUrl)), this,
SLOT(handleSourceChanged(QUrl)));
- connect(page, SIGNAL(printRequested()), this, SLOT(print()));
connect(page, SIGNAL(highlighted(QString)), this, SLOT(slotHighlighted(QString)));
-#else
- Q_UNUSED(page)
-#endif
}
bool CentralWidget::eventFilter(QObject *object, QEvent *e)
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/contentwindow.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/contentwindow.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/contentwindow.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/contentwindow.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -176,7 +176,7 @@
QAction *newTab = menu.addAction(tr("Open Link in New Tab"));
if (!HelpViewer::canOpenPage(itm->url().path()))
newTab->setEnabled(false);
-
+
menu.move(m_contentWidget->mapToGlobal(pos));
QAction *action = menu.exec();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/doc/src/assistant-manual.qdoc qttools-opensource-src-5.3.0/src/assistant/assistant/doc/src/assistant-manual.qdoc
--- qttools-opensource-src-5.2.1/src/assistant/assistant/doc/src/assistant-manual.qdoc 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/doc/src/assistant-manual.qdoc 2014-05-15 17:12:40.000000000 +0000
@@ -30,7 +30,7 @@
\title Qt Assistant Manual
\ingroup qttools
- \startpage {Qt Reference Documentation}
+ \startpage {Qt Reference Pages}
\nextpage Qt Assistant Quick Guide
\keyword Qt Assistant
@@ -568,7 +568,7 @@
\endtable
In addition to those \QA specific tags, the tags for generating and registering
- documentation can be used. See \l{Qt Help Collection Project} documentation for more information.
+ documentation can be used. See \l{Qt Help Collection Files} documentation for more information.
An example of a help collection file that uses all the available tags is shown below:
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/helpenginewrapper.h qttools-opensource-src-5.3.0/src/assistant/assistant/helpenginewrapper.h
--- qttools-opensource-src-5.2.1/src/assistant/assistant/helpenginewrapper.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/helpenginewrapper.h 2014-05-15 17:12:40.000000000 +0000
@@ -96,7 +96,7 @@
const QStringList customFilters() const;
QUrl findFile(const QUrl &url) const;
QByteArray fileData(const QUrl &url) const;
- QMap linksForIdentifier(const QString &id) const;
+ QMap linksForIdentifier(const QString &id) const;
const QStringList filterAttributes() const;
const QStringList filterAttributes(const QString &filterName) const;
QString error() const;
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/helpviewer_qwv.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/helpviewer_qwv.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/helpviewer_qwv.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/helpviewer_qwv.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -306,7 +306,7 @@
SLOT(actionChanged()));
connect(pageAction(QWebPage::Forward), SIGNAL(changed()), this,
SLOT(actionChanged()));
- connect(page(), SIGNAL(linkHovered(QString, QString, QString)), this,
+ connect(page(), SIGNAL(linkHovered(QString,QString,QString)), this,
SIGNAL(highlighted(QString)));
connect(this, SIGNAL(urlChanged(QUrl)), this, SIGNAL(sourceChanged(QUrl)));
connect(this, SIGNAL(loadStarted()), this, SLOT(setLoadStarted()));
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/indexwindow.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/indexwindow.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/indexwindow.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/indexwindow.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -213,7 +213,7 @@
QUrl url;
if (links.count() > 1) {
TopicChooser tc(this, keyword, links);
- if (tc.exec() == QDialog::Accepted)
+ if (tc.exec() == QDialog::Accepted)
url = tc.link();
} else if (links.count() == 1) {
url = links.constBegin().value();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/mainwindow.cpp qttools-opensource-src-5.3.0/src/assistant/assistant/mainwindow.cpp
--- qttools-opensource-src-5.2.1/src/assistant/assistant/mainwindow.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/mainwindow.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -66,12 +66,17 @@
#include
#include
#include
+#include
+#include
+#include
+#include
#include
#include
#include
#include
#include
+#include
#include
#include
#include
@@ -93,6 +98,8 @@
QT_BEGIN_NAMESPACE
+enum { warnAboutMissingModules = 0 };
+
MainWindow::MainWindow(CmdLineParser *cmdLine, QWidget *parent)
: QMainWindow(parent)
, m_bookmarkWidget(0)
@@ -162,8 +169,8 @@
openPagesDock->setWidget(openPagesManager->openPagesWidget());
addDockWidget(Qt::LeftDockWidgetArea, openPagesDock);
- connect(m_centralWidget, SIGNAL(addBookmark(QString, QString)),
- bookMarkManager, SLOT(addBookmark(QString, QString)));
+ connect(m_centralWidget, SIGNAL(addBookmark(QString,QString)),
+ bookMarkManager, SLOT(addBookmark(QString,QString)));
connect(bookMarkManager, SIGNAL(escapePressed()), this,
SLOT(activateCurrentCentralWidgetTab()));
connect(bookMarkManager, SIGNAL(setSource(QUrl)), m_centralWidget,
@@ -189,9 +196,14 @@
setWindowTitle(windowTitle.isEmpty() ? defWindowTitle : windowTitle);
QByteArray iconArray = helpEngineWrapper.applicationIcon();
if (iconArray.size() > 0) {
- QPixmap pix;
- pix.loadFromData(iconArray);
- QIcon appIcon(pix);
+ QBuffer buffer(&iconArray);
+ QImageReader reader(&buffer);
+ QIcon appIcon;
+ do {
+ QPixmap pix;
+ pix.convertFromImage(reader.read());
+ appIcon.addPixmap(pix);
+ } while (reader.jumpToNextImage());
qApp->setWindowIcon(appIcon);
} else {
QIcon appIcon(QLatin1String(":/qt-project.org/assistant/images/assistant-128.png"));
@@ -380,12 +392,14 @@
"qtdbus",
"qtdesigner",
"qtdoc",
+ "qtenginio",
"qtgraphicaleffects",
"qtgui",
"qthelp",
"qtimageformats",
"qtlinguist",
"qtlocation",
+ "qtmacextras",
"qtmultimedia",
"qtmultimediawidgets",
"qtnfc",
@@ -414,20 +428,42 @@
"qtquickcontrolsstyles",
"qtquickdialogs",
"qtquicklayouts",
+ "qtwebsockets",
"qtwinextras"
};
+static QStringList newQtDocumentation()
+{
+ QStringList result;
+ const QDir docDirectory(QLibraryInfo::location(QLibraryInfo::DocumentationPath));
+ const QFileInfoList entries = docDirectory.entryInfoList(QStringList(QStringLiteral("*.qch")),
+ QDir::Files, QDir::Name);
+ if (!entries.isEmpty()) {
+ result.reserve(entries.size());
+ foreach (const QFileInfo &fi, entries)
+ result.append(fi.baseName());
+ return result;
+ }
+ if (warnAboutMissingModules)
+ qWarning() << "No documentation found in " << QDir::toNativeSeparators(docDirectory.absolutePath());
+ const int docCount = int(sizeof(docs) / sizeof(docs[0]));
+ result.reserve(docCount);
+ for (int d = 0; d < docCount; ++d)
+ result.append(QLatin1String(docs[d]));
+ return result;
+}
+
void MainWindow::lookForNewQtDocumentation()
{
- enum { warnAboutMissingModules = 0 };
TRACE_OBJ
HelpEngineWrapper &helpEngine = HelpEngineWrapper::instance();
- const int docCount = int(sizeof(docs) / sizeof(docs[0]));
+ const QStringList docs = newQtDocumentation();
+ const int docCount = docs.size();
QList qtDocInfos;
qtDocInfos.reserve(docCount);
for (int d = 0; d < docCount; ++d) {
- const QString doc = QLatin1String(docs[d]);
+ const QString &doc = docs.at(d);
const QtDocInstaller::DocInfo docInfo(doc, helpEngine.qtDocInfo(doc));
qtDocInfos.append(docInfo);
if (warnAboutMissingModules && (docInfo.second.isEmpty() || docInfo.second.first().isEmpty()))
@@ -439,8 +475,8 @@
SLOT(qtDocumentationInstalled()));
connect(m_qtDocInstaller, SIGNAL(qchFileNotFound(QString)), this,
SLOT(resetQtDocInfo(QString)));
- connect(m_qtDocInstaller, SIGNAL(registerDocumentation(QString, QString)),
- this, SLOT(registerDocumentation(QString, QString)));
+ connect(m_qtDocInstaller, SIGNAL(registerDocumentation(QString,QString)),
+ this, SLOT(registerDocumentation(QString,QString)));
if (helpEngine.qtDocInfo(QLatin1String("qt")).count() != 2)
statusBar()->showMessage(tr("Looking for Qt Documentation..."));
m_qtDocInstaller->installDocs();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/preferencesdialog.h qttools-opensource-src-5.3.0/src/assistant/assistant/preferencesdialog.h
--- qttools-opensource-src-5.2.1/src/assistant/assistant/preferencesdialog.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/preferencesdialog.h 2014-05-15 17:12:40.000000000 +0000
@@ -73,7 +73,7 @@
void appFontSettingChanged(int index);
void browserFontSettingToggled(bool on);
void browserFontSettingChanged(int index);
-
+
void setBlankPage();
void setCurrentPage();
void setDefaultPage();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant/remotecontrol_win.h qttools-opensource-src-5.3.0/src/assistant/assistant/remotecontrol_win.h
--- qttools-opensource-src-5.2.1/src/assistant/assistant/remotecontrol_win.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant/remotecontrol_win.h 2014-05-15 17:12:40.000000000 +0000
@@ -54,7 +54,7 @@
public:
StdInListenerWin(QObject *parent);
~StdInListenerWin();
-
+
signals:
void receivedCommand(const QString &cmd);
diff -Nru qttools-opensource-src-5.2.1/src/assistant/assistant.pro qttools-opensource-src-5.3.0/src/assistant/assistant.pro
--- qttools-opensource-src-5.2.1/src/assistant/assistant.pro 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/assistant.pro 2014-05-15 17:12:40.000000000 +0000
@@ -1,7 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += clucene \
- help \
+ help \
assistant \
qhelpgenerator \
qcollectiongenerator \
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/clucene.pro qttools-opensource-src-5.3.0/src/assistant/clucene/clucene.pro
--- qttools-opensource-src-5.2.1/src/assistant/clucene/clucene.pro 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/clucene.pro 2014-05-15 17:12:39.000000000 +0000
@@ -16,25 +16,14 @@
}
# impossible to disable exceptions in clucene atm
-CONFIG(exceptions_off) {
- CONFIG -= exceptions_off
- CONFIG += exceptions
- !win32|win32-g++* {
- QMAKE_CFLAGS -= -fno-exceptions
- QMAKE_CXXFLAGS -= -fno-exceptions
- QMAKE_LFLAGS -= -fno-exceptions
- QMAKE_CFLAGS += -fexceptions
- QMAKE_CXXFLAGS += -fexceptions
- QMAKE_LFLAGS += -fexceptions
- }
-}
+CONFIG += exceptions
# otherwise mingw headers do not declare common functions like _i64tow
win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x
win32-msvc.net | win32-msvc2* {
- QMAKE_CFLAGS_RELEASE -= -O2
- QMAKE_CXXFLAGS_RELEASE -= -O2
+ QMAKE_CFLAGS_RELEASE -= -O2
+ QMAKE_CXXFLAGS_RELEASE -= -O2
}
# the following define could be set globally in case we need it elsewhere
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/license.txt qttools-opensource-src-5.3.0/src/assistant/clucene/license.txt
--- qttools-opensource-src-5.2.1/src/assistant/clucene/license.txt 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/license.txt 2014-05-15 17:12:39.000000000 +0000
@@ -146,7 +146,7 @@
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qanalyzer.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qanalyzer.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qanalyzer.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qanalyzer.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -184,12 +184,12 @@
QCLucenePerFieldAnalyzerWrapper::QCLucenePerFieldAnalyzerWrapper(
- QCLuceneAnalyzer *defaultAnalyzer)
+ QCLuceneAnalyzer *defaultAnalyzer)
: QCLuceneAnalyzer()
{
- d->analyzer = new
+ d->analyzer = new
lucene::analysis::PerFieldAnalyzerWrapper(defaultAnalyzer->d->analyzer);
-
+
analyzers.append(defaultAnalyzer);
defaultAnalyzer->d->deleteCLuceneAnalyzer = false;
}
@@ -199,10 +199,10 @@
qDeleteAll(analyzers);
}
-void QCLucenePerFieldAnalyzerWrapper::addAnalyzer(const QString &fieldName,
+void QCLucenePerFieldAnalyzerWrapper::addAnalyzer(const QString &fieldName,
QCLuceneAnalyzer *analyzer)
{
- lucene::analysis::PerFieldAnalyzerWrapper *analyzerWrapper =
+ lucene::analysis::PerFieldAnalyzerWrapper *analyzerWrapper =
static_cast (d->analyzer);
if (analyzerWrapper == 0)
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qanalyzer_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qanalyzer_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qanalyzer_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qanalyzer_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -76,7 +76,7 @@
virtual ~QCLuceneAnalyzer();
qint32 positionIncrementGap(const QString &fieldName) const;
- QCLuceneTokenStream tokenStream(const QString &fieldName,
+ QCLuceneTokenStream tokenStream(const QString &fieldName,
const QCLuceneReader &reader) const;
protected:
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qclucene_global_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qclucene_global_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qclucene_global_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -58,7 +58,7 @@
// W A R N I N G
// -------------
//
-// adjustments here, need to be done in
+// adjustments here, need to be done in
// QTDIR/src/3rdparty/clucene/src/CLucene/StdHeader.h as well
//
#if defined(_LUCENE_DONTIMPLEMENT_NS_MACROS)
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qdocument.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qdocument.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qdocument.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qdocument.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -90,7 +90,7 @@
}
}
delete [] fieldName;
-
+
return field;
}
@@ -99,7 +99,7 @@
QCLuceneField* field = getField(name);
if (field)
return field->stringValue();
-
+
return QString();
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qfield.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qfield.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qfield.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qfield.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -65,7 +65,7 @@
delete [] fieldValue;
}
-QCLuceneField::QCLuceneField(const QString &name, QCLuceneReader *reader,
+QCLuceneField::QCLuceneField(const QString &name, QCLuceneReader *reader,
int configs)
: d(new QCLuceneFieldPrivate())
, reader(reader)
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qfield_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qfield_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qfield_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qfield_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -63,47 +63,47 @@
class Q_CLUCENE_EXPORT QCLuceneField
{
public:
- enum Store {
- STORE_YES = 1,
- STORE_NO = 2,
- STORE_COMPRESS = 4
- };
+ enum Store {
+ STORE_YES = 1,
+ STORE_NO = 2,
+ STORE_COMPRESS = 4
+ };
- enum Index {
- INDEX_NO = 16,
- INDEX_TOKENIZED = 32,
- INDEX_UNTOKENIZED = 64,
- INDEX_NONORMS = 128
- };
+ enum Index {
+ INDEX_NO = 16,
+ INDEX_TOKENIZED = 32,
+ INDEX_UNTOKENIZED = 64,
+ INDEX_NONORMS = 128
+ };
- enum TermVector {
- TERMVECTOR_NO = 256,
- TERMVECTOR_YES = 512,
- TERMVECTOR_WITH_POSITIONS = 1024,
- TERMVECTOR_WITH_OFFSETS = 2048
- };
+ enum TermVector {
+ TERMVECTOR_NO = 256,
+ TERMVECTOR_YES = 512,
+ TERMVECTOR_WITH_POSITIONS = 1024,
+ TERMVECTOR_WITH_OFFSETS = 2048
+ };
- QCLuceneField(const QString &name, const QString &value, int configs);
- QCLuceneField(const QString &name, QCLuceneReader *reader, int configs);
+ QCLuceneField(const QString &name, const QString &value, int configs);
+ QCLuceneField(const QString &name, QCLuceneReader *reader, int configs);
~QCLuceneField();
QString name() const;
QString stringValue() const;
QCLuceneReader* readerValue() const;
- bool isStored() const;
- bool isIndexed() const;
- bool isTokenized() const;
- bool isCompressed() const;
- void setConfig(int termVector);
- bool isTermVectorStored() const;
- bool isStoreOffsetWithTermVector() const;
- bool isStorePositionWithTermVector() const;
- qreal getBoost() const;
- void setBoost(qreal value);
- bool isBinary() const;
- bool getOmitNorms() const;
- void setOmitNorms(bool omitNorms);
- QString toString() const;
+ bool isStored() const;
+ bool isIndexed() const;
+ bool isTokenized() const;
+ bool isCompressed() const;
+ void setConfig(int termVector);
+ bool isTermVectorStored() const;
+ bool isStoreOffsetWithTermVector() const;
+ bool isStorePositionWithTermVector() const;
+ qreal getBoost() const;
+ void setBoost(qreal value);
+ bool isBinary() const;
+ bool getOmitNorms() const;
+ void setOmitNorms(bool omitNorms);
+ QString toString() const;
protected:
QCLuceneField();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qhits_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qhits_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qhits_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qhits_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -65,16 +65,16 @@
class Q_CLUCENE_EXPORT QCLuceneHits
{
public:
- QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query,
+ QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query,
const QCLuceneFilter &filter);
- QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query,
+ QCLuceneHits(const QCLuceneSearcher &searcher, const QCLuceneQuery &query,
const QCLuceneFilter &filter, const QCLuceneSort &sort);
virtual ~QCLuceneHits();
QCLuceneDocument document(const qint32 index);
qint32 length() const;
- qint32 id (const qint32 index);
- qreal score(const qint32 index);
+ qint32 id(const qint32 index);
+ qreal score(const qint32 index);
protected:
friend class QCLuceneSearcher;
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qindexreader.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qindexreader.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -74,7 +74,7 @@
QCLuceneIndexReader indexReader;
indexReader.d->reader = IndexReader::open(path);
-
+
return indexReader;
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qindexreader_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qindexreader_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexreader_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -67,34 +67,34 @@
{
public:
enum FieldOption {
- ALL = 1,
- INDEXED = 2,
- UNINDEXED = 4,
- INDEXED_WITH_TERMVECTOR = 8,
- INDEXED_NO_TERMVECTOR = 16,
- TERMVECTOR = 32,
- TERMVECTOR_WITH_POSITION = 64,
- TERMVECTOR_WITH_OFFSET = 128,
- TERMVECTOR_WITH_POSITION_OFFSET = 256
- };
+ ALL = 1,
+ INDEXED = 2,
+ UNINDEXED = 4,
+ INDEXED_WITH_TERMVECTOR = 8,
+ INDEXED_NO_TERMVECTOR = 16,
+ TERMVECTOR = 32,
+ TERMVECTOR_WITH_POSITION = 64,
+ TERMVECTOR_WITH_OFFSET = 128,
+ TERMVECTOR_WITH_POSITION_OFFSET = 256
+ };
virtual ~QCLuceneIndexReader();
static bool isLuceneFile(const QString &filename);
static bool indexExists(const QString &directory);
static QCLuceneIndexReader open(const QString &path);
-
+
static void unlock(const QString &path);
static bool isLocked(const QString &directory);
- static quint64 lastModified(const QString &directory);
- static qint64 getCurrentVersion(const QString &directory);
+ static quint64 lastModified(const QString &directory);
+ static qint64 getCurrentVersion(const QString &directory);
void close();
bool isCurrent();
- void undeleteAll();
- qint64 getVersion();
- void deleteDocument(qint32 docNum);
+ void undeleteAll();
+ qint64 getVersion();
+ void deleteDocument(qint32 docNum);
bool hasNorms(const QString &field);
qint32 deleteDocuments(const QCLuceneTerm &term);
bool document(qint32 index, QCLuceneDocument &document);
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qindexwriter.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qindexwriter.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -50,7 +50,7 @@
: d(new QCLuceneIndexWriterPrivate())
, analyzer(analyzer)
{
- d->writer = new lucene::index::IndexWriter(path,
+ d->writer = new lucene::index::IndexWriter(path,
analyzer.d->analyzer, create, closeDir);
}
@@ -83,7 +83,7 @@
{
using namespace lucene::index;
IndexReader** readerArray = new IndexReader*[readers.count()];
-
+
for (int i = 0; i < readers.count(); ++i)
readerArray[i] = (readers.at(i))->d->reader;
@@ -91,7 +91,7 @@
delete [] readerArray;
}
-void QCLuceneIndexWriter::addDocument(QCLuceneDocument &doc,
+void QCLuceneIndexWriter::addDocument(QCLuceneDocument &doc,
QCLuceneAnalyzer &analyzer)
{
if (doc.d->document)
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qindexwriter_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qindexwriter_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qindexwriter_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -73,44 +73,44 @@
DEFAULT_MAX_MERGE_DOCS = 0x7FFFFFFFL
};
- QCLuceneIndexWriter(const QString &path, QCLuceneAnalyzer &analyzer,
- bool create, bool closeDir = true);
+ QCLuceneIndexWriter(const QString &path, QCLuceneAnalyzer &analyzer,
+ bool create, bool closeDir = true);
virtual ~QCLuceneIndexWriter();
- void close();
- void optimize();
+ void close();
+ void optimize();
qint32 docCount();
QCLuceneAnalyzer getAnalyzer();
-
+
void addIndexes(const QList &readers);
void addDocument(QCLuceneDocument &doc, QCLuceneAnalyzer &analyzer);
- qint32 getMaxFieldLength() const;
- void setMaxFieldLength(qint32 value);
-
+ qint32 getMaxFieldLength() const;
+ void setMaxFieldLength(qint32 value);
+
qint32 getMaxBufferedDocs() const;
void setMaxBufferedDocs(qint32 value);
-
- qint64 getWriteLockTimeout() const;
+
+ qint64 getWriteLockTimeout() const;
void setWriteLockTimeout(qint64 writeLockTimeout);
-
+
qint64 getCommitLockTimeout() const;
- void setCommitLockTimeout(qint64 commitLockTimeout);
+ void setCommitLockTimeout(qint64 commitLockTimeout);
- qint32 getMergeFactor() const;
- void setMergeFactor(qint32 value);
+ qint32 getMergeFactor() const;
+ void setMergeFactor(qint32 value);
qint32 getTermIndexInterval() const;
- void setTermIndexInterval(qint32 interval);
-
- qint32 getMinMergeDocs() const;
- void setMinMergeDocs(qint32 value);
+ void setTermIndexInterval(qint32 interval);
+
+ qint32 getMinMergeDocs() const;
+ void setMinMergeDocs(qint32 value);
- qint32 getMaxMergeDocs() const;
- void setMaxMergeDocs(qint32 value);
+ qint32 getMaxMergeDocs() const;
+ void setMaxMergeDocs(qint32 value);
bool getUseCompoundFile() const;
- void setUseCompoundFile(bool value);
+ void setUseCompoundFile(bool value);
protected:
QSharedDataPointer d;
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qquery.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qquery.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qquery.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qquery.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -73,10 +73,10 @@
bool QCLuceneQuery::instanceOf(const QString &other) const
{
- if (other == getQueryName())
- return true;
+ if (other == getQueryName())
+ return true;
- return false;
+ return false;
}
QString QCLuceneQuery::toString(const QString &field) const
@@ -160,7 +160,7 @@
bool QCLuceneRangeQuery::isInclusive() const
{
- lucene::search::RangeQuery *query =
+ lucene::search::RangeQuery *query =
static_cast (d->query);
if (query == 0)
@@ -171,7 +171,7 @@
QString QCLuceneRangeQuery::getField() const
{
- lucene::search::RangeQuery *query =
+ lucene::search::RangeQuery *query =
static_cast (d->query);
if (query == 0)
@@ -222,7 +222,7 @@
quint32 QCLuceneBooleanQuery::getClauseCount() const
{
- lucene::search::BooleanQuery *query =
+ lucene::search::BooleanQuery *query =
static_cast (d->query);
if (query == 0)
@@ -233,7 +233,7 @@
quint32 QCLuceneBooleanQuery::getMaxClauseCount() const
{
- lucene::search::BooleanQuery *query =
+ lucene::search::BooleanQuery *query =
static_cast (d->query);
if (query == 0)
@@ -244,7 +244,7 @@
void QCLuceneBooleanQuery::setMaxClauseCount(quint32 maxClauseCount)
{
- lucene::search::BooleanQuery *query =
+ lucene::search::BooleanQuery *query =
static_cast (d->query);
if (query == 0)
@@ -254,14 +254,14 @@
}
void QCLuceneBooleanQuery::add(QCLuceneQuery *query, bool required, bool prohibited)
-{
- add(query, false, required, prohibited);
+{
+ add(query, false, required, prohibited);
}
-void QCLuceneBooleanQuery::add(QCLuceneQuery *query, bool delQuery,
+void QCLuceneBooleanQuery::add(QCLuceneQuery *query, bool delQuery,
bool required, bool prohibited)
{
- lucene::search::BooleanQuery *booleanQuery =
+ lucene::search::BooleanQuery *booleanQuery =
static_cast (d->query);
if (booleanQuery == 0)
@@ -294,7 +294,7 @@
qint32 QCLucenePhraseQuery::getSlop() const
{
- lucene::search::PhraseQuery *phraseQuery =
+ lucene::search::PhraseQuery *phraseQuery =
static_cast (d->query);
if (phraseQuery == 0)
@@ -305,7 +305,7 @@
void QCLucenePhraseQuery::setSlop(const qint32 slop)
{
- lucene::search::PhraseQuery *phraseQuery =
+ lucene::search::PhraseQuery *phraseQuery =
static_cast (d->query);
if (phraseQuery == 0)
@@ -316,7 +316,7 @@
void QCLucenePhraseQuery::addTerm(const QCLuceneTerm &term)
{
- lucene::search::PhraseQuery *phraseQuery =
+ lucene::search::PhraseQuery *phraseQuery =
static_cast (d->query);
if (phraseQuery == 0)
@@ -328,7 +328,7 @@
void QCLucenePhraseQuery::addTerm(const QCLuceneTerm &term, qint32 position)
{
- lucene::search::PhraseQuery *phraseQuery =
+ lucene::search::PhraseQuery *phraseQuery =
static_cast (d->query);
if (phraseQuery == 0)
@@ -341,7 +341,7 @@
QString QCLucenePhraseQuery::getFieldName() const
{
- lucene::search::PhraseQuery *phraseQuery =
+ lucene::search::PhraseQuery *phraseQuery =
static_cast (d->query);
if (phraseQuery == 0)
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qqueryparser.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qqueryparser.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qqueryparser.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qqueryparser.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -141,13 +141,13 @@
QCLuceneQuery* QCLuceneMultiFieldQueryParser::parse(const QString &query,
const QStringList &fieldList,
- QList flags,
+ QList flags,
QCLuceneAnalyzer &analyzer)
{
QCLuceneBooleanQuery *retValue = new QCLuceneBooleanQuery();
qint32 i = 0;
foreach (const QString &field, fieldList) {
- QCLuceneQuery *q = QCLuceneQueryParser::parse(query, field, analyzer);
+ QCLuceneQuery *q = QCLuceneQueryParser::parse(query, field, analyzer);
if (q) {
qint32 flag = flags.at(i);
switch (flag) {
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qqueryparser_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qqueryparser_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qqueryparser_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qqueryparser_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -71,7 +71,7 @@
QCLuceneQuery* parse(const QString &query);
QCLuceneQuery* parse(QCLuceneReader &reader);
- static QCLuceneQuery* parse(const QString &query, const QString &field,
+ static QCLuceneQuery* parse(const QString &query, const QString &field,
QCLuceneAnalyzer &analyzer);
QCLuceneAnalyzer getAnalyzer();
QString getField();
@@ -94,7 +94,7 @@
PROHIBITED_FIELD = 2
};
- QCLuceneMultiFieldQueryParser(const QStringList &fieldList,
+ QCLuceneMultiFieldQueryParser(const QStringList &fieldList,
QCLuceneAnalyzer &analyzer);
~QCLuceneMultiFieldQueryParser();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qquery_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qquery_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qquery_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qquery_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -76,7 +76,7 @@
qreal getBoost() const;
QString getQueryName() const;
bool instanceOf(const QString &other) const;
- QString toString(const QString &field) const;
+ QString toString(const QString &field) const;
quint32 hashCode() const;
QString toString() const;
bool equals(const QCLuceneQuery &other) const;
@@ -102,8 +102,8 @@
~QCLucenePrefixQuery();
static QString getClassName();
-
- QCLuceneTerm getPrefix() const;
+
+ QCLuceneTerm getPrefix() const;
private:
QCLuceneTerm prefix;
@@ -112,13 +112,13 @@
class Q_CLUCENE_EXPORT QCLuceneRangeQuery : public QCLuceneQuery
{
public:
- QCLuceneRangeQuery(const QCLuceneTerm &lowerTerm,
+ QCLuceneRangeQuery(const QCLuceneTerm &lowerTerm,
const QCLuceneTerm &upperTerm, bool inclusive);
~QCLuceneRangeQuery();
static QString getClassName();
-
- QCLuceneTerm getLowerTerm() const;
+
+ QCLuceneTerm getLowerTerm() const;
QCLuceneTerm getUpperTerm() const;
bool isInclusive() const;
@@ -136,8 +136,8 @@
~QCLuceneTermQuery();
static QString getClassName();
-
- QCLuceneTerm getTerm() const;
+
+ QCLuceneTerm getTerm() const;
private:
QCLuceneTerm term;
@@ -172,7 +172,7 @@
qint32 getSlop() const;
void setSlop(const qint32 slop);
-
+
void addTerm(const QCLuceneTerm &term);
void addTerm(const QCLuceneTerm &term, qint32 position);
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qsearchable_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qsearchable_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qsearchable_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -93,7 +93,7 @@
QCLuceneHits search(const QCLuceneQuery &query);
QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneFilter &filter);
QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneSort &sort);
- QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneFilter &filter,
+ QCLuceneHits search(const QCLuceneQuery &query, const QCLuceneFilter &filter,
const QCLuceneSort &sort);
protected:
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qterm_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qterm_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qterm_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qterm_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -73,17 +73,17 @@
virtual ~QCLuceneTerm();
QString field() const;
- QString text() const;
-
- void set(const QString &field, const QString &text);
- void set(const QCLuceneTerm &fieldTerm, const QString &text);
- void set(const QString &field, const QString &text, bool internField);
+ QString text() const;
+
+ void set(const QString &field, const QString &text);
+ void set(const QCLuceneTerm &fieldTerm, const QString &text);
+ void set(const QString &field, const QString &text, bool internField);
bool equals(const QCLuceneTerm &other) const;
qint32 compareTo(const QCLuceneTerm &other) const;
-
- QString toString() const;
- quint32 hashCode() const;
+
+ QString toString() const;
+ quint32 hashCode() const;
quint32 textLength() const;
protected:
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qtoken.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qtoken.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qtoken.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qtoken.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -52,13 +52,13 @@
d->token = new lucene::analysis::Token();
}
-QCLuceneToken::QCLuceneToken(const QString &text, qint32 startOffset,
+QCLuceneToken::QCLuceneToken(const QString &text, qint32 startOffset,
qint32 endOffset, const QString &defaultTyp)
: d(new QCLuceneTokenPrivate())
, tokenText(QStringToTChar(text))
, tokenType(QStringToTChar(defaultTyp))
{
- d->token = new lucene::analysis::Token(tokenText, int32_t(startOffset),
+ d->token = new lucene::analysis::Token(tokenText, int32_t(startOffset),
int32_t(endOffset), tokenType);
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qtokenizer.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qtokenizer.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qtokenizer.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qtokenizer.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -55,7 +55,7 @@
QCLuceneStandardTokenizer::QCLuceneStandardTokenizer(const QCLuceneReader &reader)
: QCLuceneTokenizer(reader)
{
- d->tokenStream =
+ d->tokenStream =
new lucene::analysis::standard::StandardTokenizer(reader.d->reader);
}
@@ -64,10 +64,10 @@
// nothing todo
}
-bool QCLuceneStandardTokenizer::readApostrophe(const QString &string,
+bool QCLuceneStandardTokenizer::readApostrophe(const QString &string,
QCLuceneToken &token)
{
- lucene::analysis::standard::StandardTokenizer *stdTokenizer =
+ lucene::analysis::standard::StandardTokenizer *stdTokenizer =
static_cast (d->tokenStream);
if (stdTokenizer == 0)
@@ -77,13 +77,13 @@
lucene::util::StringBuffer buffer(value);
bool retValue = stdTokenizer->ReadApostrophe(&buffer, token.d->token);
delete [] value;
-
+
return retValue;
}
bool QCLuceneStandardTokenizer::readAt(const QString &string, QCLuceneToken &token)
{
- lucene::analysis::standard::StandardTokenizer *stdTokenizer =
+ lucene::analysis::standard::StandardTokenizer *stdTokenizer =
static_cast (d->tokenStream);
if (stdTokenizer == 0)
@@ -93,14 +93,14 @@
lucene::util::StringBuffer buffer(value);
bool retValue = stdTokenizer->ReadAt(&buffer, token.d->token);
delete [] value;
-
+
return retValue;
}
-bool QCLuceneStandardTokenizer::readCompany(const QString &string,
+bool QCLuceneStandardTokenizer::readCompany(const QString &string,
QCLuceneToken &token)
{
- lucene::analysis::standard::StandardTokenizer *stdTokenizer =
+ lucene::analysis::standard::StandardTokenizer *stdTokenizer =
static_cast (d->tokenStream);
if (stdTokenizer == 0)
@@ -110,7 +110,7 @@
lucene::util::StringBuffer buffer(value);
bool retValue = stdTokenizer->ReadCompany(&buffer, token.d->token);
delete [] value;
-
+
return retValue;
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qtoken_p.h qttools-opensource-src-5.3.0/src/assistant/clucene/qtoken_p.h
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qtoken_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qtoken_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -65,12 +65,12 @@
{
public:
QCLuceneToken();
- QCLuceneToken(const QString &text, qint32 startOffset,
+ QCLuceneToken(const QString &text, qint32 startOffset,
qint32 endOffset, const QString &defaultTyp = QLatin1String("word"));
-
+
virtual ~QCLuceneToken();
- void set(const QString &text, qint32 startOffset,
+ void set(const QString &text, qint32 startOffset,
qint32 endOffset, const QString &defaultTyp = QLatin1String("word"));
quint32 bufferLength() const;
diff -Nru qttools-opensource-src-5.2.1/src/assistant/clucene/qtokenstream.cpp qttools-opensource-src-5.3.0/src/assistant/clucene/qtokenstream.cpp
--- qttools-opensource-src-5.2.1/src/assistant/clucene/qtokenstream.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/clucene/qtokenstream.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -61,7 +61,7 @@
bool QCLuceneTokenStream::next(QCLuceneToken &token)
{
- return d->tokenStream->next(token.d->token);
+ return d->tokenStream->next(token.d->token);
}
QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/help.pro qttools-opensource-src-5.3.0/src/assistant/help/help.pro
--- qttools-opensource-src-5.2.1/src/assistant/help/help.pro 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/help.pro 2014-05-15 17:12:40.000000000 +0000
@@ -11,18 +11,7 @@
DEFINES -= QT_ASCII_CAST_WARNINGS
# impossible to disable exceptions in clucene atm and use help lib without
-CONFIG(exceptions_off) {
- CONFIG -= exceptions_off
- CONFIG += exceptions
- !win32|win32-g++* {
- QMAKE_CFLAGS -= -fno-exceptions
- QMAKE_CXXFLAGS -= -fno-exceptions
- QMAKE_LFLAGS -= -fno-exceptions
- QMAKE_CFLAGS += -fexceptions
- QMAKE_CXXFLAGS += -fexceptions
- QMAKE_LFLAGS += -fexceptions
- }
-}
+CONFIG += exceptions
RESOURCES += helpsystem.qrc
SOURCES += qhelpenginecore.cpp \
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpcollectionhandler.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpcollectionhandler.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpcollectionhandler.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpcollectionhandler.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -76,7 +76,7 @@
{
if (m_dbOpened)
return true;
- emit error(tr("The collection file '%1' is not set up yet!").
+ emit error(tr("The collection file '%1' is not set up yet.").
arg(m_collectionFile));
return false;
}
@@ -99,7 +99,7 @@
m_connectionName);
if (db.driver()
&& db.driver()->lastError().type() == QSqlError::ConnectionError) {
- emit error(tr("Cannot load sqlite database driver!"));
+ emit error(tr("Cannot load sqlite database driver."));
return false;
}
@@ -122,7 +122,7 @@
m_query.next();
if (m_query.value(0).toInt() < 1) {
if (!createTables(&m_query)) {
- emit error(tr("Cannot create tables in file %1!").arg(collectionFile()));
+ emit error(tr("Cannot create tables in file %1.").arg(collectionFile()));
return false;
}
}
@@ -138,7 +138,7 @@
QFileInfo fi(fileName);
if (fi.exists()) {
- emit error(tr("The collection file '%1' already exists!").
+ emit error(tr("The collection file '%1' already exists.").
arg(fileName));
return false;
}
@@ -289,7 +289,7 @@
filterNameId = m_query.value(0).toInt();
if (filterNameId < 0) {
- emit error(tr("Unknown filter '%1'!").arg(filterName));
+ emit error(tr("Unknown filter '%1'.").arg(filterName));
return false;
}
@@ -342,7 +342,7 @@
}
if (nameId < 0) {
- emit error(tr("Cannot register filter %1!").arg(filterName));
+ emit error(tr("Cannot register filter %1.").arg(filterName));
return false;
}
@@ -386,13 +386,13 @@
QHelpDBReader reader(fileName, QHelpGlobal::uniquifyConnectionName(
QLatin1String("QHelpCollectionHandler"), this), 0);
if (!reader.init()) {
- emit error(tr("Cannot open documentation file %1!").arg(fileName));
+ emit error(tr("Cannot open documentation file %1.").arg(fileName));
return false;
}
QString ns = reader.namespaceName();
if (ns.isEmpty()) {
- emit error(tr("Invalid documentation file '%1'!").arg(fileName));
+ emit error(tr("Invalid documentation file '%1'.").arg(fileName));
return false;
}
@@ -426,7 +426,7 @@
nsId = m_query.value(0).toInt();
if (nsId < 0) {
- emit error(tr("The namespace %1 was not registered!").arg(namespaceName));
+ emit error(tr("The namespace %1 was not registered.").arg(namespaceName));
return false;
}
@@ -546,7 +546,7 @@
m_query.exec();
while (m_query.next()) {
if (m_query.value(0).toInt() > 0) {
- emit error(tr("Namespace %1 already exists!").arg(nspace));
+ emit error(tr("Namespace %1 already exists.").arg(nspace));
return -1;
}
}
@@ -559,7 +559,7 @@
if (m_query.exec())
namespaceId = m_query.lastInsertId().toInt();
if (namespaceId < 1) {
- emit error(tr("Cannot register namespace '%1'!").arg(nspace));
+ emit error(tr("Cannot register namespace '%1'.").arg(nspace));
return -1;
}
return namespaceId;
@@ -583,7 +583,7 @@
db.setDatabaseName(fileName);
if (!db.open()) {
QSqlDatabase::removeDatabase(QLatin1String("optimize"));
- emit error(tr("Cannot open database '%1' to optimize!").arg(fileName));
+ emit error(tr("Cannot open database '%1' to optimize.").arg(fileName));
return;
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpcollectionhandler_p.h qttools-opensource-src-5.3.0/src/assistant/help/qhelpcollectionhandler_p.h
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpcollectionhandler_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpcollectionhandler_p.h 2014-05-15 17:12:40.000000000 +0000
@@ -101,7 +101,7 @@
bool addFilterAttributes(const QStringList &attributes);
QStringList filterAttributes() const;
QStringList filterAttributes(const QString &filterName) const;
-
+
int registerNamespace(const QString &nspace, const QString &fileName);
bool registerVirtualFolder(const QString &folderName, int namespaceId);
void optimizeDatabase(const QString &fileName);
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpdatainterface.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpdatainterface.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpdatainterface.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpdatainterface.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -103,7 +103,7 @@
bool QHelpDataIndexItem::operator==(const QHelpDataIndexItem & other) const
{
- return (other.name == name)
+ return (other.name == name)
&& (other.reference == reference);
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpdatainterface_p.h qttools-opensource-src-5.3.0/src/assistant/help/qhelpdatainterface_p.h
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpdatainterface_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpdatainterface_p.h 2014-05-15 17:12:40.000000000 +0000
@@ -85,7 +85,7 @@
QString name;
QString identifier;
QString reference;
-
+
bool operator==(const QHelpDataIndexItem & other) const;
};
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpdbreader.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpdbreader.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpdbreader.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpdbreader.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -546,13 +546,13 @@
"a.FilterAttributeId=b.Id AND b.Name='%1'"))
.arg(attributes.at(i)));
}
-
+
if (!m_query->exec(query))
return ids;
while (m_query->next())
ids.insert(m_query->value(0).toInt());
-
+
return ids;
}
@@ -573,7 +573,7 @@
if (m_viewAttributes.count() || needUpdate) {
m_viewAttributes.clear();
- m_indicesCache = indexIds;
+ m_indicesCache = indexIds;
}
foreach (const QString &s, attributes)
m_viewAttributes.insert(s);
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpdbreader_p.h qttools-opensource-src-5.3.0/src/assistant/help/qhelpdbreader_p.h
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpdbreader_p.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpdbreader_p.h 2014-05-15 17:12:40.000000000 +0000
@@ -68,7 +68,7 @@
Q_OBJECT
public:
- QHelpDBReader(const QString &dbName);
+ QHelpDBReader(const QString &dbName);
QHelpDBReader(const QString &dbName, const QString &uniqueId,
QObject *parent);
~QHelpDBReader();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpenginecore.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpenginecore.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpenginecore.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpenginecore.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -119,7 +119,7 @@
QHelpDBReader *reader = new QHelpDBReader(absFileName,
QHelpGlobal::uniquifyConnectionName(info.fileName, this), this);
if (!reader->init()) {
- emit q->warning(QHelpEngineCore::tr("Cannot open documentation file %1: %2!")
+ emit q->warning(QHelpEngineCore::tr("Cannot open documentation file %1: %2.")
.arg(absFileName, reader->errorMessage()));
continue;
}
@@ -523,7 +523,7 @@
return res;
QHelpDBReader *reader = d->readerMap.value(namespaceName);
if (!reader) {
- d->error = tr("The specified namespace does not exist!");
+ d->error = tr("The specified namespace does not exist.");
return res;
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpenginecore.h qttools-opensource-src-5.3.0/src/assistant/help/qhelpenginecore.h
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpenginecore.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpenginecore.h 2014-05-15 17:12:40.000000000 +0000
@@ -60,7 +60,7 @@
Q_PROPERTY(bool autoSaveFilter READ autoSaveFilter WRITE setAutoSaveFilter)
Q_PROPERTY(QString collectionFile READ collectionFile WRITE setCollectionFile)
Q_PROPERTY(QString currentFilter READ currentFilter WRITE setCurrentFilter)
-
+
public:
explicit QHelpEngineCore(const QString &collectionFile, QObject *parent = 0);
virtual ~QHelpEngineCore();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpengine.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpengine.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpengine.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpengine.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -96,22 +96,30 @@
void QHelpEnginePrivate::setContentsWidgetBusy()
{
+#ifndef QT_NO_CURSOR
contentWidget->setCursor(Qt::WaitCursor);
+#endif
}
void QHelpEnginePrivate::unsetContentsWidgetBusy()
{
+#ifndef QT_NO_CURSOR
contentWidget->unsetCursor();
+#endif
}
void QHelpEnginePrivate::setIndexWidgetBusy()
{
+#ifndef QT_NO_CURSOR
indexWidget->setCursor(Qt::WaitCursor);
+#endif
}
void QHelpEnginePrivate::unsetIndexWidgetBusy()
{
+#ifndef QT_NO_CURSOR
indexWidget->unsetCursor();
+#endif
}
void QHelpEnginePrivate::stopDataCollection()
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpgenerator.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpgenerator.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpgenerator.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpgenerator.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -155,20 +155,20 @@
emit progressChanged(0);
d->error.clear();
if (!helpData || helpData->namespaceName().isEmpty()) {
- d->error = tr("Invalid help data!");
+ d->error = tr("Invalid help data.");
return false;
}
QString outFileName = outputFileName;
if (outFileName.isEmpty()) {
- d->error = tr("No output file name specified!");
+ d->error = tr("No output file name specified.");
return false;
}
QFileInfo fi(outFileName);
if (fi.exists()) {
if (!fi.dir().remove(fi.fileName())) {
- d->error = tr("The file %1 cannot be overwritten!").arg(outFileName);
+ d->error = tr("The file %1 cannot be overwritten.").arg(outFileName);
return false;
}
}
@@ -186,7 +186,7 @@
}
if (!openingOk) {
- d->error = tr("Cannot open data base file %1!").arg(outFileName);
+ d->error = tr("Cannot open data base file %1.").arg(outFileName);
cleanupDB();
return false;
}
@@ -200,7 +200,7 @@
insertMetaData(helpData->metaData());
if (!registerVirtualFolder(helpData->virtualFolder(), helpData->namespaceName())) {
- d->error = tr("Cannot register namespace %1!").arg(helpData->namespaceName());
+ d->error = tr("Cannot register namespace %1.").arg(helpData->namespaceName());
cleanupDB();
return false;
}
@@ -308,7 +308,7 @@
"AND Name=\'NamespaceTable\'"));
d->query->next();
if (d->query->value(0).toInt() > 0) {
- d->error = tr("Some tables already exist!");
+ d->error = tr("Some tables already exist.");
return false;
}
@@ -369,7 +369,7 @@
foreach (const QString &q, tables) {
if (!d->query->exec(q)) {
- d->error = tr("Cannot create tables!");
+ d->error = tr("Cannot create tables.");
return false;
}
}
@@ -455,7 +455,7 @@
return d->virtualFolderId > 0;
}
}
- d->error = tr("Cannot register virtual folder!");
+ d->error = tr("Cannot register virtual folder.");
return false;
}
@@ -648,12 +648,12 @@
if (d->query->exec())
nameId = d->query->lastInsertId().toInt();
} else if (!forceUpdate) {
- d->error = tr("The filter %1 is already registered!").arg(filterName);
+ d->error = tr("The filter %1 is already registered.").arg(filterName);
return false;
}
if (nameId < 0) {
- d->error = tr("Cannot register filter %1!").arg(filterName);
+ d->error = tr("Cannot register filter %1.").arg(filterName);
return false;
}
@@ -777,7 +777,7 @@
d->query->exec();
int contentId = d->query->lastInsertId().toInt();
if (contentId < 1) {
- d->error = tr("Cannot insert contents!");
+ d->error = tr("Cannot insert contents.");
return false;
}
@@ -789,7 +789,7 @@
d->query->bindValue(1, filterAtt);
d->query->exec();
if (!d->query->isActive()) {
- d->error = tr("Cannot register contents!");
+ d->error = tr("Cannot register contents.");
return false;
}
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpprojectdata.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpprojectdata.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpprojectdata.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpprojectdata.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -99,7 +99,7 @@
readProject();
else
raiseError(QCoreApplication::translate("QHelpProject",
- "Unknown token. Expected \"QtHelpProject\"!"));
+ "Unknown token. Expected \"QtHelpProject\"."));
}
}
@@ -379,7 +379,7 @@
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly)) {
d->errorMsg = QCoreApplication::translate("QHelpProject",
- "The input file %1 could not be opened!").arg(fileName);
+ "The input file %1 could not be opened.").arg(fileName);
return false;
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchindexwriter_default.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchindexwriter_default.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchindexwriter_default.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchindexwriter_default.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -207,7 +207,7 @@
const QLatin1String key("DefaultSearchNamespaces");
const QString collectionFile(this->m_collectionFile);
const QString indexPath = m_indexFilesFolder;
-
+
mutex.unlock();
QHelpEngineCore engine(collectionFile, 0);
@@ -255,7 +255,7 @@
// get rid of duplicated files
if (url.hasFragment())
url.setFragment(QString());
-
+
QString s = url.toString();
if (s.endsWith(QLatin1String(".html"))
|| s.endsWith(QLatin1String(".htm"))
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchquerywidget.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchquerywidget.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchquerywidget.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchquerywidget.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -101,6 +101,7 @@
QHelpSearchQueryWidgetPrivate()
: QObject()
+ , compactMode(false)
, simpleSearch(true)
, searchCompleter(new CompleterModel(this), this)
{
@@ -287,6 +288,25 @@
}
private slots:
+ bool eventFilter(QObject *ob, QEvent *event)
+ {
+ if (event->type() == QEvent::KeyPress) {
+ QKeyEvent *const keyEvent = static_cast(event);
+ if (keyEvent->key() == Qt::Key_Down) {
+ if (simpleQueries.curQuery + 1 < simpleQueries.queries.size())
+ nextQuery();
+ return true;
+ }
+ if (keyEvent->key() == Qt::Key_Up) {
+ if (simpleQueries.curQuery > 0)
+ prevQuery();
+ return true;
+ }
+
+ }
+ return QObject::eventFilter(ob, event);
+ }
+
void showHideAdvancedSearch()
{
if (simpleSearch) {
@@ -381,6 +401,7 @@
private:
friend class QHelpSearchQueryWidget;
+ bool compactMode;
bool simpleSearch;
QLabel *simpleSearchLabel;
QLabel *advancedSearchLabel;
@@ -441,6 +462,7 @@
d->simpleSearchLabel = new QLabel(this);
d->defaultQuery = new QLineEdit(this);
d->defaultQuery->setCompleter(&d->searchCompleter);
+ d->defaultQuery->installEventFilter(d);
d->prevQueryButton = new QToolButton(this);
d->prevQueryButton->setArrowType(Qt::LeftArrow);
d->prevQueryButton->setEnabled(false);
@@ -529,6 +551,7 @@
d, SLOT(showHideAdvancedSearch()));
#endif
connect(this, SIGNAL(search()), d, SLOT(searchRequested()));
+ setCompactMode(true);
}
/*!
@@ -593,6 +616,21 @@
d->searchRequested();
}
+bool QHelpSearchQueryWidget::isCompactMode() const
+{
+ return d->compactMode;
+}
+
+void QHelpSearchQueryWidget::setCompactMode(bool on)
+{
+ if (d->compactMode != on) {
+ d->compactMode = on;
+ d->prevQueryButton->setVisible(!on);
+ d->nextQueryButton->setVisible(!on);
+ d->simpleSearchLabel->setVisible(!on);
+ }
+}
+
/*!
\reimp
*/
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchquerywidget.h qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchquerywidget.h
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchquerywidget.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchquerywidget.h 2014-05-15 17:12:40.000000000 +0000
@@ -71,6 +71,9 @@
QList query() const;
void setQuery(const QList &queryList);
+ bool isCompactMode() const;
+ Q_SLOT void setCompactMode(bool on);
+
Q_SIGNALS:
void search();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchresultwidget.cpp qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchresultwidget.cpp
--- qttools-opensource-src-5.2.1/src/assistant/help/qhelpsearchresultwidget.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/help/qhelpsearchresultwidget.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -116,7 +116,7 @@
"%1 "
"%2
")).arg(tr("Note:"))
.arg(tr("The search results may not be complete since the "
- "documentation is still being indexed!"));
+ "documentation is still being indexed."));
foreach (const QHelpSearchEngine::SearchHit &hit, hits) {
htmlFile += QString(QLatin1String("The help system offers the possibility to filter all installed documentations
for certain
attributes. Commonly specified attributes are e.g. the company
and product name as well as the product version.
-
The help engine and Assistant use custom filters to do the actual
+
The help engine and Assistant use custom filters to do the actual
documentation filtering. A custom filter is basically just a alias name for a
list of filter attributes. So, if e.g. the custom filter "MyFilter" lists
the attributes "mycompany, myproduct" then only the documentation with those
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/doc/identifierpage.html qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/doc/identifierpage.html
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/doc/identifierpage.html 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/doc/identifierpage.html 2014-05-15 17:12:40.000000000 +0000
@@ -4,7 +4,7 @@
be used to specify keywords which should not be shown in the index. Identifiers
are especially help full when using context sensitive help and one keyword has
more links assigned to it.
-
E.g. consider the keyword "replace" in Qt. It is
+
E.g. consider the keyword "replace" in Qt. It is
included, among others, in QString and QList. To be able to retrieve the proper
documentation, there is an identifier "QString::replace" and one
"QList::replace".
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/finishpage.h qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/finishpage.h
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/finishpage.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/finishpage.h 2014-05-15 17:12:40.000000000 +0000
@@ -55,7 +55,7 @@
public:
FinishPage(QWidget *parent = 0);
void appendMessage(const QString &msg);
-
+
private:
QTextEdit *m_textEdit;
};
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/identifierpage.cpp qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/identifierpage.cpp
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/identifierpage.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/identifierpage.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -51,7 +51,7 @@
"the keywords found in the .adp or .dcf file."));
m_ui.setupUi(this);
-
+
connect(m_ui.identifierCheckBox, SIGNAL(toggled(bool)),
this, SLOT(setupButtons(bool)));
@@ -64,7 +64,7 @@
{
m_ui.globalButton->setEnabled(checked);
m_ui.fileNameButton->setEnabled(checked);
- m_ui.prefixLineEdit->setEnabled(checked
+ m_ui.prefixLineEdit->setEnabled(checked
&& m_ui.globalButton->isChecked());
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/identifierpage.h qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/identifierpage.h
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/identifierpage.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/identifierpage.h 2014-05-15 17:12:40.000000000 +0000
@@ -53,12 +53,12 @@
public:
IdentifierPage(QWidget *parent = 0);
-
+
private slots:
void setupButtons(bool checked);
private:
- Ui::IdentifierPage m_ui;
+ Ui::IdentifierPage m_ui;
};
QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/inputpage.h qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/inputpage.h
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/inputpage.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/inputpage.h 2014-05-15 17:12:40.000000000 +0000
@@ -55,7 +55,7 @@
public:
explicit InputPage(AdpReader *reader, QWidget *parent = 0);
-
+
private slots:
void getFileName();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/main.cpp qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/main.cpp
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/main.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/main.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -70,7 +70,7 @@
QFileInfo fi(QString::fromLocal8Bit(argv[1]));
if (fi.exists())
w.setAdpFileName(fi.absoluteFilePath());
- }
+ }
w.show();
return app.exec();
}
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/outputpage.cpp qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/outputpage.cpp
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/outputpage.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/outputpage.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -98,7 +98,7 @@
QFile fi(m_path + QDir::separator() + fileName);
if (!fi.exists())
return true;
-
+
if (QMessageBox::warning(this, title,
tr("The specified file %1 already exist.\n\nDo you want to remove it?")
.arg(fileName), tr("Remove"), tr("Cancel")) == 0) {
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/pathpage.h qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/pathpage.h
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/pathpage.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/pathpage.h 2014-05-15 17:12:40.000000000 +0000
@@ -56,7 +56,7 @@
void setPath(const QString &path);
QStringList paths() const;
QStringList filters() const;
-
+
private slots:
void addPath();
void removePath();
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/qhcpwriter.cpp qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/qhcpwriter.cpp
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/qhcpwriter.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/qhcpwriter.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -52,7 +52,7 @@
void QhcpWriter::setHelpProjectFile(const QString &qhpFile)
{
- m_qhpFile = qhpFile;
+ m_qhpFile = qhpFile;
}
void QhcpWriter::setProperties(const QMap
props)
@@ -70,7 +70,7 @@
QFile out(fileName);
if (!out.open(QIODevice::WriteOnly))
return false;
-
+
setDevice(&out);
writeStartDocument();
writeStartElement(QLatin1String("QHelpCollectionProject"));
@@ -127,7 +127,7 @@
out.append(QLatin1String(".qch"));
writeStartElement(QLatin1String("docFiles"));
-
+
writeStartElement(QLatin1String("generate"));
writeStartElement(QLatin1String("file"));
writeTextElement(QLatin1String("input"), m_qhpFile);
diff -Nru qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/qhpwriter.h qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/qhpwriter.h
--- qttools-opensource-src-5.2.1/src/assistant/qhelpconverter/qhpwriter.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/qhelpconverter/qhpwriter.h 2014-05-15 17:12:40.000000000 +0000
@@ -60,7 +60,7 @@
void setCustomFilters(const QList filters);
void setFiles(const QStringList &files);
void generateIdentifiers(IdentifierPrefix prefix,
- const QString prefixString = QString());
+ const QString prefixString = QString());
bool writeFile(const QString &fileName);
private:
diff -Nru qttools-opensource-src-5.2.1/src/assistant/shared/helpgenerator.h qttools-opensource-src-5.3.0/src/assistant/shared/helpgenerator.h
--- qttools-opensource-src-5.2.1/src/assistant/shared/helpgenerator.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/assistant/shared/helpgenerator.h 2014-05-15 17:12:40.000000000 +0000
@@ -63,7 +63,7 @@
private slots:
void printStatus(const QString &msg);
void printWarning(const QString &msg);
-
+
private:
QHelpGenerator *generator;
};
diff -Nru qttools-opensource-src-5.2.1/src/designer/data/generate_header.xsl qttools-opensource-src-5.3.0/src/designer/data/generate_header.xsl
--- qttools-opensource-src-5.2.1/src/designer/data/generate_header.xsl 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/data/generate_header.xsl 2014-05-15 17:12:39.000000000 +0000
@@ -163,7 +163,7 @@
,
&endl;
-
+
};&endl;
diff -Nru qttools-opensource-src-5.2.1/src/designer/data/ui3.xsd qttools-opensource-src-5.3.0/src/designer/data/ui3.xsd
--- qttools-opensource-src-5.2.1/src/designer/data/ui3.xsd 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/data/ui3.xsd 2014-05-15 17:12:39.000000000 +0000
@@ -1,6 +1,6 @@
-
+
@@ -66,7 +66,7 @@
-
+
@@ -77,7 +77,7 @@
-
+
@@ -133,7 +133,7 @@
-
+
@@ -206,7 +206,7 @@
-
+
@@ -220,7 +220,7 @@
-
+
@@ -238,7 +238,7 @@
-
+
@@ -272,7 +272,7 @@
-
+
@@ -297,7 +297,7 @@
-
+
@@ -313,7 +313,7 @@
-
+
@@ -349,5 +349,5 @@
-
+
\ No newline at end of file
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/formwindowcursor.cpp qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/formwindowcursor.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/formwindowcursor.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/formwindowcursor.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -169,12 +169,12 @@
// build selection
const int N = selectedWidgetCount();
Q_ASSERT(N);
-
+
SetPropertyCommand::ObjectList selection;
- for (int i=0; iinit(selection, name, value, current())) {
m_formWindow->commandHistory()->push(setPropertyCommand);
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/formwindowmanager.cpp qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/formwindowmanager.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/formwindowmanager.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/formwindowmanager.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -816,7 +816,7 @@
{
if (const QLayout *ml = LayoutInfo::managedLayout(core, w)) {
// Try to find managed items, ignore dummy grid spacers
- const int count = ml->count();
+ const int count = ml->count();
for (int i = 0; i < count; i++)
if (!LayoutInfo::isEmptyItem(ml->itemAt(i)))
return true;
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/formwindowsettings.h qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/formwindowsettings.h
--- qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/formwindowsettings.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/formwindowsettings.h 2014-05-15 17:12:39.000000000 +0000
@@ -45,7 +45,7 @@
#include
QT_BEGIN_NAMESPACE
-
+
namespace Ui {
class FormWindowSettings;
}
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/qmainwindow_container.cpp qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/qmainwindow_container.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/components/formeditor/qmainwindow_container.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/formeditor/qmainwindow_container.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -88,7 +88,7 @@
namespace {
// Pair of
typedef QPair ToolBarData;
-
+
ToolBarData toolBarData(QToolBar *me) {
const QMainWindow *mw = qobject_cast(me->parentWidget());
if (!mw || !mw->layout() || mw->layout()->indexOf(me) == -1)
@@ -96,7 +96,7 @@
return ToolBarData(mw->toolBarArea(me), mw->toolBarBreak(me));
}
-Qt::DockWidgetArea dockWidgetArea(QDockWidget *me)
+Qt::DockWidgetArea dockWidgetArea(QDockWidget *me)
{
if (const QMainWindow *mw = qobject_cast(me->parentWidget())) {
// Make sure that me is actually managed by mw, otherwise
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/lib/lib.pro qttools-opensource-src-5.3.0/src/designer/src/components/lib/lib.pro
--- qttools-opensource-src-5.2.1/src/designer/src/components/lib/lib.pro 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/lib/lib.pro 2014-05-15 17:12:39.000000000 +0000
@@ -42,4 +42,4 @@
# * MinGW-builds GCC 4.6.3 64-bit
# * MinGW-builds GCC 4.7.1 64-bit
# * MinGW-w64 GCC 4.7.1 64-bit (rubenvb)
-win32-g++*:CONFIG -= precompile_header
+mingw:CONFIG -= precompile_header
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/objectinspector/objectinspector.cpp qttools-opensource-src-5.3.0/src/designer/src/components/objectinspector/objectinspector.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/components/objectinspector/objectinspector.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/objectinspector/objectinspector.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -262,7 +262,7 @@
m_treeView->setContextMenuPolicy(Qt::CustomContextMenu);
}
-
+
ObjectInspector::ObjectInspectorPrivate::~ObjectInspectorPrivate()
{
delete m_treeView->itemDelegate();
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/designerpropertymanager.cpp qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/designerpropertymanager.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/designerpropertymanager.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/designerpropertymanager.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -69,6 +69,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -2353,7 +2354,7 @@
} else if (type == DesignerPropertyManager::designerStringListTypeId()) {
applyToEditors(m_stringListPropertyToEditors.value(property), &StringListEditorButton::setStringList, qvariant_cast(value).value());
} else if (type == DesignerPropertyManager::designerKeySequenceTypeId()) {
- applyToEditors(m_keySequencePropertyToEditors.value(property), &QtKeySequenceEdit::setKeySequence, qvariant_cast(value).value());
+ applyToEditors(m_keySequencePropertyToEditors.value(property), &QKeySequenceEdit::setKeySequence, qvariant_cast(value).value());
}
break;
}
@@ -2513,7 +2514,7 @@
connect(ed, SIGNAL(stringListChanged(QStringList)), this, SLOT(slotStringListChanged(QStringList)));
editor = ed;
} else if (type == DesignerPropertyManager::designerKeySequenceTypeId()) {
- QtKeySequenceEdit *ed = new QtKeySequenceEdit(parent);
+ QKeySequenceEdit *ed = new QKeySequenceEdit(parent);
ed->setKeySequence(qvariant_cast(manager->value(property)).value());
m_keySequencePropertyToEditors[property].append(ed);
m_editorToKeySequenceProperty[ed] = property;
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/designerpropertymanager.h qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/designerpropertymanager.h
--- qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/designerpropertymanager.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/designerpropertymanager.h 2014-05-15 17:12:39.000000000 +0000
@@ -62,7 +62,7 @@
class QDesignerFormEditorInterface;
class QLineEdit;
class QUrl;
-class QtKeySequenceEdit;
+class QKeySequenceEdit;
namespace qdesigner_internal
{
@@ -298,8 +298,8 @@
QMap > m_stringPropertyToEditors;
QMap m_editorToStringProperty;
- QMap > m_keySequencePropertyToEditors;
- QMap m_editorToKeySequenceProperty;
+ QMap > m_keySequencePropertyToEditors;
+ QMap m_editorToKeySequenceProperty;
QMap > m_palettePropertyToEditors;
QMap m_editorToPaletteProperty;
QMap > m_pixmapPropertyToEditors;
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/paletteeditor.cpp qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/paletteeditor.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/paletteeditor.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/paletteeditor.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -59,7 +59,7 @@
enum { BrushRole = 33 };
-PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent) :
+PaletteEditor::PaletteEditor(QDesignerFormEditorInterface *core, QWidget *parent) :
QDialog(parent),
m_currentColorGroup(QPalette::Active),
m_paletteModel(new PaletteModel(this)),
@@ -238,7 +238,7 @@
//////////////////////
-PaletteModel::PaletteModel(QObject *parent) :
+PaletteModel::PaletteModel(QObject *parent) :
QAbstractTableModel(parent),
m_compute(true)
{
@@ -419,7 +419,7 @@
QWidget(parent),
m_button(new QtColorButton(this)),
m_changed(false),
- m_core(core)
+ m_core(core)
{
QLayout *layout = new QHBoxLayout(this);
layout->setMargin(0);
@@ -500,12 +500,12 @@
setEdited(false);
emit changed(this);
}
-
+
//////////////////////////
ColorDelegate::ColorDelegate(QDesignerFormEditorInterface *core, QObject *parent) :
QItemDelegate(parent),
m_core(core)
-{
+{
}
QWidget *ColorDelegate::createEditor(QWidget *parent, const QStyleOptionViewItem &,
@@ -593,8 +593,8 @@
painter->restore();
}
QItemDelegate::paint(painter, option, index);
-
-
+
+
const QColor color = static_cast(QApplication::style()->styleHint(QStyle::SH_Table_GridLineColor, &option));
const QPen oldPen = painter->pen();
painter->setPen(QPen(color));
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/previewframe.h qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/previewframe.h
--- qttools-opensource-src-5.2.1/src/designer/src/components/propertyeditor/previewframe.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/propertyeditor/previewframe.h 2014-05-15 17:12:39.000000000 +0000
@@ -60,7 +60,7 @@
void setPreviewPalette(const QPalette &palette);
void setSubWindowActive(bool active);
-
+
private:
// The user can on some platforms close the mdi child by invoking the system menu.
// Ensure a child is present.
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/components/taskmenu/menutaskmenu.h qttools-opensource-src-5.3.0/src/designer/src/components/taskmenu/menutaskmenu.h
--- qttools-opensource-src-5.2.1/src/designer/src/components/taskmenu/menutaskmenu.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/components/taskmenu/menutaskmenu.h 2014-05-15 17:12:39.000000000 +0000
@@ -57,7 +57,7 @@
class PromotionTaskMenu;
// The QMenu task menu provides promotion and a remove option. The actual
-// menu context options are not forwarded since they make only sense
+// menu context options are not forwarded since they make only sense
// when a menu is being edited/visible.
class MenuTaskMenu : public QObject, public QDesignerTaskMenuExtension
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/designer/appfontdialog.h qttools-opensource-src-5.3.0/src/designer/src/designer/appfontdialog.h
--- qttools-opensource-src-5.2.1/src/designer/src/designer/appfontdialog.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/designer/appfontdialog.h 2014-05-15 17:12:39.000000000 +0000
@@ -54,7 +54,7 @@
class QItemSelection;
class QDesignerSettingsInterface;
-// AppFontWidget: Manages application fonts which the user can load and
+// AppFontWidget: Manages application fonts which the user can load and
// provides API for saving/restoring them.
class AppFontWidget : public QGroupBox
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/designer/doc/qtdesigner.qdocconf qttools-opensource-src-5.3.0/src/designer/src/designer/doc/qtdesigner.qdocconf
--- qttools-opensource-src-5.2.1/src/designer/src/designer/doc/qtdesigner.qdocconf 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/designer/doc/qtdesigner.qdocconf 2014-05-15 17:12:39.000000000 +0000
@@ -45,7 +45,7 @@
outputdir = $QT_INSTALL_DOCS/qtdesigner
-depends += qtdoc qtwidgets qtcore qtuitools
+depends += qtdoc qtwidgets qtcore qtuitools qtquick qmake
navigation.landingpage = "Qt Designer Manual"
navigation.cppclassespage = "Qt Designer C++ Classes"
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp qttools-opensource-src-5.3.0/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/designer/doc/snippets/lib/tools_designer_src_lib_sdk_abstractpropertyeditor.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -42,8 +42,8 @@
QDesignerPropertyEditorInterface *propertyEditor = 0;
propertyEditor = formEditor->propertyEditor();
- connect(propertyEditor, SIGNAL(propertyChanged(QString, QVariant)),
- this, SLOT(checkProperty(QString, QVariant)));
+ connect(propertyEditor, SIGNAL(propertyChanged(QString,QVariant)),
+ this, SLOT(checkProperty(QString,QVariant)));
//! [0]
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/designer/newform.cpp qttools-opensource-src-5.3.0/src/designer/src/designer/newform.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/designer/newform.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/designer/newform.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -96,7 +96,7 @@
m_buttonBox = createButtonBox();
vBoxLayout->addWidget(m_buttonBox);
setLayout(vBoxLayout);
-
+
resize(500, 400);
slotCurrentTemplateChanged(m_newFormWidget->hasCurrentTemplate());
}
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/designer/qdesigner.cpp qttools-opensource-src-5.3.0/src/designer/src/designer/qdesigner.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/designer/qdesigner.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/designer/qdesigner.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -231,13 +231,6 @@
installTranslator(translator);
installTranslator(qtTranslator);
- if (QLibraryInfo::licensedProducts() == QStringLiteral("Console")) {
- QMessageBox::information(0, tr("Qt Designer"),
- tr("This application cannot be used for the Console edition of Qt"));
- QMetaObject::invokeMethod(this, "quit", Qt::QueuedConnection);
- return;
- }
-
m_workbench = new QDesignerWorkbench();
emit initialized();
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/designer/qdesigner_server.cpp qttools-opensource-src-5.3.0/src/designer/src/designer/qdesigner_server.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/designer/qdesigner_server.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/designer/qdesigner_server.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -131,7 +131,7 @@
m_socket->connectToHost(QHostAddress::LocalHost, port);
connect(m_socket, SIGNAL(readyRead()),
this, SLOT(readFromSocket()));
-
+
}
QDesignerClient::~QDesignerClient()
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/lib.pro qttools-opensource-src-5.3.0/src/designer/src/lib/lib.pro
--- qttools-opensource-src-5.2.1/src/designer/src/lib/lib.pro 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/lib.pro 2014-05-15 17:12:39.000000000 +0000
@@ -3,6 +3,7 @@
TARGET = QtDesigner
QT = core-private gui-private widgets-private xml
+MODULE_PLUGIN_TYPES = designer
MODULE_CONFIG = designer_defines
load(qt_module)
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractformwindowmanager.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractformwindowmanager.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractformwindowmanager.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractformwindowmanager.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -431,7 +431,7 @@
*/
/*!
- \fn QDesignerFormWindowInterface *QDesignerFormWindowManagerInterface::formWindow(int index)
+ \fn QDesignerFormWindowInterface *QDesignerFormWindowManagerInterface::formWindow(int index) const
Returns the form window at the given \a index.
\sa setActiveFormWindow(), removeFormWindow()
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractmetadatabase.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractmetadatabase.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractmetadatabase.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractmetadatabase.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -150,7 +150,7 @@
\sa tabOrder()
*/
-
+
/*!
\fn bool QDesignerMetaDataBaseItemInterface::enabled() const
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractmetadatabase.h qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractmetadatabase.h
--- qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractmetadatabase.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractmetadatabase.h 2014-05-15 17:12:39.000000000 +0000
@@ -62,12 +62,12 @@
virtual QString name() const = 0;
virtual void setName(const QString &name) = 0;
-
+
virtual QList tabOrder() const = 0;
virtual void setTabOrder(const QList &tabOrder) = 0;
-
+
virtual bool enabled() const = 0;
- virtual void setEnabled(bool b) = 0;
+ virtual void setEnabled(bool b) = 0;
};
@@ -85,7 +85,7 @@
virtual QList objects() const = 0;
virtual QDesignerFormEditorInterface *core() const = 0;
-
+
Q_SIGNALS:
void changed();
};
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractpromotioninterface.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractpromotioninterface.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractpromotioninterface.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractpromotioninterface.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -81,28 +81,28 @@
Returns a set of promoted classed that are referenced by the currently opened forms.
*/
-/*!
+/*!
\fn virtual bool QDesignerPromotionInterface::addPromotedClass(const QString &baseClass, const QString &className, const QString &includeFile, QString *errorMessage)
Add a promoted class named \a with the base class \a and include file \a includeFile. Returns \c true on success or \c false along
with an error message in \a errorMessage on failure.
*/
-/*!
+/*!
\fn virtual bool QDesignerPromotionInterface::removePromotedClass(const QString &className, QString *errorMessage)
Remove the promoted class named \a className unless it is referenced by a form. Returns \c true on success or \c false along
with an error message in \a errorMessage on failure.
*/
-/*!
+/*!
\fn virtual bool QDesignerPromotionInterface::changePromotedClassName(const QString &oldClassName, const QString &newClassName, QString *errorMessage)
Change the class name of a promoted class from \a oldClassName to \a newClassName. Returns \c true on success or \c false along
with an error message in \a errorMessage on failure.
*/
-/*!
+/*!
\fn virtual bool QDesignerPromotionInterface::setPromotedClassIncludeFile(const QString &className, const QString &includeFile, QString *errorMessage)
Change the include file of a promoted class named \a className to be \a includeFile. Returns \c true on success or \c false along
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/sdk/abstractwidgetdatabase.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -99,9 +99,9 @@
*/
void QDesignerWidgetDataBaseInterface::insert(int index, QDesignerWidgetDataBaseItemInterface *item)
{
- if (debugWidgetDataBase)
- qDebug() << "insert at " << index << ' ' << item->name() << " derived from " << item->extends();
-
+ if (debugWidgetDataBase)
+ qDebug() << "insert at " << index << ' ' << item->name() << " derived from " << item->extends();
+
m_items.insert(index, item);
}
@@ -109,7 +109,7 @@
*/
void QDesignerWidgetDataBaseInterface::append(QDesignerWidgetDataBaseItemInterface *item)
{
- if (debugWidgetDataBase)
+ if (debugWidgetDataBase)
qDebug() << "append " << item->name() << " derived from " << item->extends();
m_items.append(item);
}
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/csshighlighter_p.h qttools-opensource-src-5.3.0/src/designer/src/lib/shared/csshighlighter_p.h
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/csshighlighter_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/csshighlighter_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -71,7 +71,7 @@
void highlight(const QString&, int, int, int/*State*/);
private:
- enum State { Selector, Property, Value, Pseudo, Pseudo1, Pseudo2, Quote,
+ enum State { Selector, Property, Value, Pseudo, Pseudo1, Pseudo2, Quote,
MaybeComment, Comment, MaybeCommentEnd };
};
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/formwindowbase.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/formwindowbase.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/formwindowbase.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/formwindowbase.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -47,7 +47,7 @@
#include "qdesigner_menu_p.h"
#include "qdesigner_menubar_p.h"
#include "shared_settings_p.h"
-#include "grid_p.h"
+#include "grid_p.h"
#include "deviceprofile_p.h"
#include "qdesigner_utils_p.h"
#include "spacer_widget_p.h"
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/formwindowbase_p.h qttools-opensource-src-5.3.0/src/designer/src/lib/shared/formwindowbase_p.h
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/formwindowbase_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/formwindowbase_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -185,7 +185,7 @@
private:
void syncGridFeature();
- FormWindowBasePrivate *m_d;
+ FormWindowBasePrivate *m_d;
};
} // namespace qdesigner_internal
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/metadatabase.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/metadatabase.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/metadatabase.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/metadatabase.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -227,7 +227,7 @@
qDebug() << "WARNING: Recursive promotion of " << oldCustomClassName << " to " << customClassName
<< ". A plugin is missing.";
}
- item->setCustomClassName(customClassName);
+ item->setCustomClassName(customClassName);
if (debugMetaDatabase) {
qDebug() << "Promoting " << widget->metaObject()->className() << " to " << customClassName;
}
@@ -267,7 +267,7 @@
return QString();
return item->customClassName();
}
-
+
QDESIGNER_SHARED_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* widget)
{
const QString customClassName = promotedCustomClassName(core,widget);
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/metadatabase_p.h qttools-opensource-src-5.3.0/src/designer/src/lib/shared/metadatabase_p.h
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/metadatabase_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/metadatabase_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -126,7 +126,7 @@
// promotion convenience
QDESIGNER_SHARED_EXPORT bool promoteWidget(QDesignerFormEditorInterface *core,QWidget *widget,const QString &customClassName);
- QDESIGNER_SHARED_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget);
+ QDESIGNER_SHARED_EXPORT void demoteWidget(QDesignerFormEditorInterface *core,QWidget *widget);
QDESIGNER_SHARED_EXPORT bool isPromoted(QDesignerFormEditorInterface *core, QWidget* w);
QDESIGNER_SHARED_EXPORT QString promotedCustomClassName(QDesignerFormEditorInterface *core, QWidget* w);
QDESIGNER_SHARED_EXPORT QString promotedExtends(QDesignerFormEditorInterface *core, QWidget* w);
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/morphmenu.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/morphmenu.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/morphmenu.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/morphmenu.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -266,7 +266,7 @@
}
/* Morph a widget into another class. Use the static addMorphMacro() to
- * add a respective command sequence to the undo stack as it emits signals
+ * add a respective command sequence to the undo stack as it emits signals
* which cause other commands to be added. */
class MorphWidgetCommand : public QDesignerFormWindowCommand
{
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/newactiondialog.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/newactiondialog.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/newactiondialog.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/newactiondialog.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -89,7 +89,7 @@
m_actionEditor(parent)
{
m_ui->setupUi(this);
-
+
m_ui->tooltipEditor->setTextPropertyValidationMode(ValidationRichText);
connect(m_ui->toolTipToolButton, SIGNAL(clicked()), this, SLOT(slotEditToolTip()));
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/newactiondialog.ui qttools-opensource-src-5.3.0/src/designer/src/lib/shared/newactiondialog.ui
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/newactiondialog.ui 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/newactiondialog.ui 2014-05-15 17:12:39.000000000 +0000
@@ -196,7 +196,7 @@
-
-
-
+
0
@@ -256,12 +256,6 @@
1
- QtKeySequenceEdit
- QWidget
- qtpropertybrowserutils_p.h
- 1
-
-
TextPropertyEditor
QWidget
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/previewmanager.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/previewmanager.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/previewmanager.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/previewmanager.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -177,7 +177,7 @@
protected:
// Fit the widget in case the orientation changes (transposing screensize)
- virtual void fitWidget(const QSize &size);
+ virtual void fitWidget(const QSize &size);
// Calculate the complete transformation for the skin
// (base class implementation provides rotation).
virtual QMatrix skinTransform() const;
@@ -193,7 +193,7 @@
};
PreviewDeviceSkin::PreviewDeviceSkin(const DeviceSkinParameters ¶meters, QWidget *parent) :
- DeviceSkin(parameters, parent),
+ DeviceSkin(parameters, parent),
m_screenSize(parameters.screenSize()),
m_direction(DirectionUp),
m_directionUpAction(0),
@@ -257,7 +257,7 @@
connect(directionGroup, SIGNAL(triggered(QAction*)), this, SLOT(slotDirection(QAction*)));
directionGroup->setExclusive(true);
m_directionUpAction = createCheckableActionIntData(tr("&Portrait"), DirectionUp, m_direction, directionGroup, this);
- //: Rotate form preview counter-clockwise
+ //: Rotate form preview counter-clockwise
m_directionLeftAction = createCheckableActionIntData(tr("Landscape (&CCW)"), DirectionLeft, m_direction, directionGroup, this);
//: Rotate form preview clockwise
m_directionRightAction = createCheckableActionIntData(tr("&Landscape (CW)"), DirectionRight, m_direction, directionGroup, this);
@@ -299,7 +299,7 @@
QMatrix PreviewDeviceSkin::skinTransform() const
{
- QMatrix newTransform;
+ QMatrix newTransform;
switch (m_direction) {
case DirectionUp:
break;
@@ -352,7 +352,7 @@
void zoomPercentChanged(int);
protected:
- virtual void populateContextMenu(QMenu *m);
+ virtual void populateContextMenu(QMenu *m);
virtual QMatrix skinTransform() const;
virtual void fitWidget(const QSize &size);
@@ -389,7 +389,7 @@
}
void ZoomablePreviewDeviceSkin::setPreview(QWidget *formWidget)
-{
+{
m_zoomWidget->setWidget(formWidget);
m_zoomWidget->resize(scaleSize(zoomPercent(), screenSize()));
}
@@ -408,7 +408,7 @@
if (m_zoomMenu->zoom() != zp)
m_zoomMenu->setZoom(zp);
- QApplication::setOverrideCursor(Qt::WaitCursor);
+ QApplication::setOverrideCursor(Qt::WaitCursor);
m_zoomWidget->setZoom(zp);
setTransform(skinTransform());
QApplication::restoreOverrideCursor();
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_formwindowmanager.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -71,7 +71,7 @@
}
/*!
- \fn PreviewManager *QDesignerFormWindowManager::previewManager()
+ \fn PreviewManager *QDesignerFormWindowManager::previewManager() const
Accesses the previewmanager implementation.
@@ -85,15 +85,4 @@
dlg.exec();
}
-/*!
- \fn void QDesignerFormWindowManager::formWindowSettingsChanged(QDesignerFormWindowInterface *fw);
-
- This signal is emitted when the form settings dialog was shown
- and changes have been made to the form.
-
- \since 4.5
- \internal
-*/
-
-
QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_propertysheet.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_propertysheet.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_propertysheet.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_propertysheet.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -1476,7 +1476,7 @@
PropertyNotDesignable };
static inline DesignableState designableState(const QDesignerMetaPropertyInterface *p, const QObject *object)
-{
+{
if (p->attributes(object) & QDesignerMetaPropertyInterface::DesignableAttribute)
return PropertyIsDesignable;
return (p->attributes() & QDesignerMetaPropertyInterface::DesignableAttribute) ?
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_stackedbox.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_stackedbox.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_stackedbox.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_stackedbox.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -174,9 +174,6 @@
void QStackedWidgetPreviewEventFilter::updateButtonToolTip(QObject *o)
{
- QString className = QStringLiteral("Stacked widget");
- if (const QDesignerFormWindowInterface *fw = QDesignerFormWindowInterface::findFormWindow(m_stackedWidget))
- className = qdesigner_internal::WidgetFactory::classNameOf(fw->core(), m_stackedWidget);
if (o == m_prev) {
const QString msg = tr("Go to previous page of %1 '%2' (%3/%4).").arg(stackedClassName(m_stackedWidget)).arg(m_stackedWidget->objectName()).arg(m_stackedWidget->currentIndex() + 1).arg(m_stackedWidget->count());
m_prev->setToolTip(msg);
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_widgetitem.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_widgetitem.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/qdesigner_widgetitem.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/qdesigner_widgetitem.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -304,7 +304,7 @@
return m_cachedContainingLayout;
}
-void QDesignerWidgetItem::layoutChanged()
+void QDesignerWidgetItem::layoutChanged()
{
if (DebugWidgetItem)
qDebug() << Q_FUNC_INFO;
@@ -312,7 +312,7 @@
}
bool QDesignerWidgetItem::eventFilter(QObject * /* watched */, QEvent *event)
-{
+{
if (event->type() == QEvent::ParentChange)
layoutChanged();
return false;
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/sheet_delegate.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/shared/sheet_delegate.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/sheet_delegate.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/sheet_delegate.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -118,7 +118,7 @@
// draw text
QRect textrect = QRect(r.left() + i*2, r.top(), r.width() - ((5*i)/2), r.height());
- QString text = elidedText(option.fontMetrics, textrect.width(), Qt::ElideMiddle,
+ QString text = elidedText(option.fontMetrics, textrect.width(), Qt::ElideMiddle,
model->data(index, Qt::DisplayRole).toString());
m_view->style()->drawItemText(painter, textrect, Qt::AlignCenter,
option.palette, m_view->isEnabled(), text);
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/shared/zoomwidget_p.h qttools-opensource-src-5.3.0/src/designer/src/lib/shared/zoomwidget_p.h
--- qttools-opensource-src-5.2.1/src/designer/src/lib/shared/zoomwidget_p.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/shared/zoomwidget_p.h 2014-05-15 17:12:39.000000000 +0000
@@ -143,7 +143,7 @@
int m_zoom;
qreal m_zoomFactor;
- bool m_zoomContextMenuEnabled;
+ bool m_zoomContextMenuEnabled;
bool m_resizeBlocked;
ZoomMenu *m_zoomMenu;
};
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/uilib/abstractformbuilder.cpp qttools-opensource-src-5.3.0/src/designer/src/lib/uilib/abstractformbuilder.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/lib/uilib/abstractformbuilder.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/uilib/abstractformbuilder.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -147,9 +147,9 @@
The QFormBuilder class is typically used by custom components and
applications that embed \QD. Standalone applications that need to
dynamically generate user interfaces at run-time use the
- QUiLoader, found in the QtUiTools module.
+ QUiLoader, found in the \l{Qt UI Tools} module.
- \sa {QtUiTools Module}
+ \sa {Qt UI Tools}
*/
/*!
@@ -2455,7 +2455,7 @@
loadItemPropsNFlags(this, item, properties);
#else
loadItemPropsNFlags(this, item, properties);
-#endif
+#endif
}
DomProperty *currentRow = propertyMap(ui_widget->elementProperty()).value(strings.currentRowProperty);
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/uilib/customwidget.qdoc qttools-opensource-src-5.3.0/src/designer/src/lib/uilib/customwidget.qdoc
--- qttools-opensource-src-5.2.1/src/designer/src/lib/uilib/customwidget.qdoc 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/uilib/customwidget.qdoc 2014-05-15 17:12:39.000000000 +0000
@@ -64,7 +64,7 @@
\QD constructs instances of the custom widget by calling the plugin's
createWidget() function with a suitable parent widget. Plugins must
construct and return an instance of a custom widget with the specified
- parent widget.
+ parent widget.
Exporting your custom widget plugin to \QD using the Q_PLUGIN_METADATA()
macro. For example, if a library called \c libcustomwidgetplugin.so
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/lib/uilib/widgets.table qttools-opensource-src-5.3.0/src/designer/src/lib/uilib/widgets.table
--- qttools-opensource-src-5.2.1/src/designer/src/lib/uilib/widgets.table 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/lib/uilib/widgets.table 2014-05-15 17:12:39.000000000 +0000
@@ -134,7 +134,7 @@
DECLARE_WIDGET(QWizardPage, "")
#endif
-#if !defined(QT_NO_GRAPHICSVIEW) || (QT_EDITION & QT_MODULE_GRAPHICSVIEW) != QT_MODULE_GRAPHICSVIEW
+#if !defined(QT_NO_GRAPHICSVIEW)
DECLARE_WIDGET_1(QGraphicsView, "")
#endif
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp qttools-opensource-src-5.3.0/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/plugins/activeqt/qaxwidgetpropertysheet.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -58,6 +58,13 @@
const char *QAxWidgetPropertySheet::controlPropertyName = "control";
+static QString designerPropertyToString(const QVariant &value)
+{
+ return value.canConvert() ?
+ qvariant_cast(value).value() :
+ value.toString();
+}
+
QAxWidgetPropertySheet::QAxWidgetPropertySheet(QDesignerAxWidget *object, QObject *parent) :
QDesignerPropertySheet(object, parent),
m_controlProperty(controlPropertyName),
@@ -121,9 +128,7 @@
}
// Loading forms: Reload
if (name == m_controlProperty) {
- const QString clsid = value.canConvert() ?
- qvariant_cast(value).value() :
- value.toString();
+ const QString clsid = designerPropertyToString(value);
if (clsid.isEmpty() || !axWidget()->loadControl(clsid))
reset(index);
else
@@ -181,8 +186,8 @@
foundGeometry = true;
continue;
}
- if (name == QLatin1String(controlPropertyName)) {
- sheet->setChanged(index, !i.value().toString().isEmpty());
+ if (name == QLatin1String(controlPropertyName)) {
+ sheet->setChanged(index, !designerPropertyToString(i.value()).isEmpty());
continue;
}
sheet->setChanged(index, true);
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/plugins/plugins.pro qttools-opensource-src-5.3.0/src/designer/src/plugins/plugins.pro
--- qttools-opensource-src-5.2.1/src/designer/src/plugins/plugins.pro 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/plugins/plugins.pro 2014-05-15 17:12:39.000000000 +0000
@@ -3,3 +3,4 @@
# qtHaveModule(opengl): SUBDIRS += tools/view3d
qtHaveModule(webkitwidgets): SUBDIRS += qwebview
win32: qtHaveModule(axcontainer): SUBDIRS += activeqt
+qtHaveModule(quickwidgets): SUBDIRS += qquickwidget
Binary files /tmp/35bHMc3ytr/qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/images/qquickwidget.png and /tmp/u3seSCrbeO/qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/images/qquickwidget.png differ
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp
--- qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qquickwidget_plugin.h"
+
+#include
+#include
+
+#include
+#include
+#include
+
+QT_BEGIN_NAMESPACE
+
+QQuickWidgetPlugin::QQuickWidgetPlugin(QObject *parent)
+ : QObject(parent)
+ , m_initialized(false)
+{
+}
+
+QString QQuickWidgetPlugin::name() const
+{
+ return QStringLiteral("QQuickWidget");
+}
+
+QString QQuickWidgetPlugin::group() const
+{
+ return QStringLiteral("Display Widgets");
+}
+
+QString QQuickWidgetPlugin::toolTip() const
+{
+ return QStringLiteral("A widget for displaying a Qt Quick user interface.");
+}
+
+QString QQuickWidgetPlugin::whatsThis() const
+{
+ return toolTip();
+}
+
+QString QQuickWidgetPlugin::includeFile() const
+{
+ return QStringLiteral("QQuickWidget");
+}
+
+QIcon QQuickWidgetPlugin::icon() const
+{
+ return QIcon(QStringLiteral(":/qt-project.org/qquickwidget/images/qquickwidget.png"));
+}
+
+bool QQuickWidgetPlugin::isContainer() const
+{
+ return false;
+}
+
+QWidget *QQuickWidgetPlugin::createWidget(QWidget *parent)
+{
+ QQuickWidget *result = new QQuickWidget(parent);
+ connect(result, SIGNAL(sceneGraphError(QQuickWindow::SceneGraphError,QString)),
+ this, SLOT(sceneGraphError(QQuickWindow::SceneGraphError,QString)));
+ return result;
+}
+
+bool QQuickWidgetPlugin::isInitialized() const
+{
+ return m_initialized;
+}
+
+void QQuickWidgetPlugin::initialize(QDesignerFormEditorInterface * /*core*/)
+{
+ if (m_initialized)
+ return;
+
+ m_initialized = true;
+}
+
+QString QQuickWidgetPlugin::domXml() const
+{
+ return QStringLiteral("\
+ \
+ \
+ \
+ QQuickWidget::SizeRootObjectToView\
+ \
+ \
+ \
+ 0\
+ 0\
+ 300\
+ 200\
+ \
+ \
+ \
+ ");
+}
+
+void QQuickWidgetPlugin::sceneGraphError(QQuickWindow::SceneGraphError, const QString &message)
+{
+ qWarning() << Q_FUNC_INFO << ':' << message;
+}
+
+QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h
--- qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,79 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the Qt Designer of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQUICKWIDGET_PLUGIN_H
+#define QQUICKWIDGET_PLUGIN_H
+
+#include
+#include
+
+QT_BEGIN_NAMESPACE
+
+class QQuickWidgetPlugin: public QObject, public QDesignerCustomWidgetInterface
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDesignerCustomWidgetInterface")
+ Q_INTERFACES(QDesignerCustomWidgetInterface)
+public:
+ explicit QQuickWidgetPlugin(QObject *parent = 0);
+
+ QString name() const Q_DECL_OVERRIDE;
+ QString group() const Q_DECL_OVERRIDE;
+ QString toolTip() const Q_DECL_OVERRIDE;
+ QString whatsThis() const Q_DECL_OVERRIDE;
+ QString includeFile() const Q_DECL_OVERRIDE;
+ QIcon icon() const Q_DECL_OVERRIDE;
+ bool isContainer() const Q_DECL_OVERRIDE;
+ QWidget *createWidget(QWidget *parent) Q_DECL_OVERRIDE;
+ bool isInitialized() const Q_DECL_OVERRIDE;
+ void initialize(QDesignerFormEditorInterface *core) Q_DECL_OVERRIDE;
+ QString domXml() const Q_DECL_OVERRIDE;
+
+private slots:
+ void sceneGraphError(QQuickWindow::SceneGraphError, const QString &);
+
+private:
+ bool m_initialized;
+};
+
+QT_END_NAMESPACE
+
+#endif // QQUICKWIDGET_PLUGIN_H
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.qrc qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.qrc
--- qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.qrc 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget_plugin.qrc 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,5 @@
+
+
+ images/qquickwidget.png
+
+
diff -Nru qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget.pro qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget.pro
--- qttools-opensource-src-5.2.1/src/designer/src/plugins/qquickwidget/qquickwidget.pro 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/designer/src/plugins/qquickwidget/qquickwidget.pro 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,9 @@
+TARGET = qquickwidget
+QT += widgets quickwidgets
+
+PLUGIN_CLASS_NAME = QQuickWidgetPlugin
+include(../plugins.pri)
+
+SOURCES += qquickwidget_plugin.cpp
+HEADERS += qquickwidget_plugin.h
+RESOURCES += qquickwidget_plugin.qrc
diff -Nru qttools-opensource-src-5.2.1/src/kmap2qmap/main.cpp qttools-opensource-src-5.3.0/src/kmap2qmap/main.cpp
--- qttools-opensource-src-5.2.1/src/kmap2qmap/main.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/kmap2qmap/main.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -510,7 +510,7 @@
ts << "#ifndef QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H" << endl;
ts << "#define QEVDEVKEYBOARDHANDLER_DEFAULTMAP_H" << endl << endl;
- ts << "const QEvdevKeyboardMap::Mapping QWSKbPrivate::s_keymap_default[] = {" << endl;
+ ts << "const QEvdevKeyboardMap::Mapping QEvdevKeyboardHandler::s_keymap_default[] = {" << endl;
for (int i = 0; i < m_keymap.size(); ++i) {
const QEvdevKeyboardMap::Mapping &m = m_keymap.at(i);
@@ -521,7 +521,7 @@
ts << "};" << endl << endl;
- ts << "const QEvdevKeyboardMap::Composing QWSKbPrivate::s_keycompose_default[] = {" << endl;
+ ts << "const QEvdevKeyboardMap::Composing QEvdevKeyboardHandler::s_keycompose_default[] = {" << endl;
for (int i = 0; i < m_keycompose.size(); ++i) {
const QEvdevKeyboardMap::Composing &c = m_keycompose.at(i);
@@ -682,7 +682,7 @@
parseWarning("codec doesn't habe exactly one argument");
}
else if (tokens[0] == "strings") {
- // simply ignore those - they have no meaning for QWS
+ // simply ignore those - they have no meaning for us
}
else if (tokens[0] == "compose") {
if (tokens.count() == 5 && tokens[3] == "to") {
@@ -883,8 +883,6 @@
if (sym == "VoidSymbol" || sym == "nul")
return true;
- bool try_to_find_qtcode = false;
-
if (sym[0] >= '0' && sym[0] <= '9') { // kernel internal action number
return false;
} else if (sym.length() == 6 && sym[1] == '+' && (sym[0] == 'U' || sym[0] == 'u')) { // unicode
@@ -892,7 +890,6 @@
unicode = sym.mid(2).toUInt(&ok, 16);
if (!ok)
return false;
- try_to_find_qtcode = true;
} else { // symbolic
for (int i = 0; i < symbol_synonyms_size; ++i) {
if (sym == symbol_synonyms[i].from) {
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/doc/qtlinguist.qdocconf qttools-opensource-src-5.3.0/src/linguist/linguist/doc/qtlinguist.qdocconf
--- qttools-opensource-src-5.2.1/src/linguist/linguist/doc/qtlinguist.qdocconf 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/doc/qtlinguist.qdocconf 2014-05-15 17:12:39.000000000 +0000
@@ -34,6 +34,6 @@
outputdir = $QT_INSTALL_DOCS/qtlinguist
-depends += qtdoc qtqml qtquick qtcore
+depends += qtdoc qtqml qtquick qtcore qtgui
navigation.landingpage = "Qt Linguist Manual"
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/doc/src/linguist-manual.qdoc qttools-opensource-src-5.3.0/src/linguist/linguist/doc/src/linguist-manual.qdoc
--- qttools-opensource-src-5.2.1/src/linguist/linguist/doc/src/linguist-manual.qdoc 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/doc/src/linguist-manual.qdoc 2014-05-15 17:12:39.000000000 +0000
@@ -974,7 +974,7 @@
We recommend concatenating the \c .qm files of the modules required to
one file matching the meta catalog file name using the tool \l lconvert in
the deploy step. For example, to create a German translation file for an
- application using the modules \l QtCore, \l QtGui and \l {Qt Declarative},
+ application using the modules \l{Qt Core}, \l {Qt GUI}, and \l {Qt Quick},
run:
\code
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/finddialog.cpp qttools-opensource-src-5.3.0/src/linguist/linguist/finddialog.cpp
--- qttools-opensource-src-5.2.1/src/linguist/linguist/finddialog.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/finddialog.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -78,7 +78,7 @@
(comments->isChecked() ? DataModel::Comments : 0));
else
where = DataModel::Translations;
- emit findNext(led->text(), where, matchCase->isChecked(), ignoreAccelerators->isChecked());
+ emit findNext(led->text(), where, matchCase->isChecked(), ignoreAccelerators->isChecked(), skipObsolete->isChecked());
led->selectAll();
}
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/finddialog.h qttools-opensource-src-5.3.0/src/linguist/linguist/finddialog.h
--- qttools-opensource-src-5.2.1/src/linguist/linguist/finddialog.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/finddialog.h 2014-05-15 17:12:39.000000000 +0000
@@ -56,7 +56,8 @@
FindDialog(QWidget *parent = 0);
signals:
- void findNext(const QString& text, DataModel::FindLocation where, bool matchCase, bool ignoreAccelerators);
+ void findNext(const QString& text, DataModel::FindLocation where,
+ bool matchCase, bool ignoreAccelerators, bool skipObsolete);
private slots:
void emitFindNext();
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/finddialog.ui qttools-opensource-src-5.3.0/src/linguist/linguist/finddialog.ui
--- qttools-opensource-src-5.2.1/src/linguist/linguist/finddialog.ui 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/finddialog.ui 2014-05-15 17:12:39.000000000 +0000
@@ -175,6 +175,16 @@
+ -
+
+
+ Obsoleted messages are skipped when checked.
+
+
+ Skip &obsolete
+
+
+
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/mainwindow.cpp qttools-opensource-src-5.3.0/src/linguist/linguist/mainwindow.cpp
--- qttools-opensource-src-5.2.1/src/linguist/linguist/mainwindow.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/mainwindow.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -267,6 +267,7 @@
m_printer(0),
m_findMatchCase(Qt::CaseInsensitive),
m_findIgnoreAccelerators(true),
+ m_findSkipObsolete(false),
m_findWhere(DataModel::NoLocation),
m_translationSettingsDialog(0),
m_settingCurrentMessage(false),
@@ -473,8 +474,8 @@
this, SLOT(updateTranslation(QStringList)));
connect(m_messageEditor, SIGNAL(translatorCommentChanged(QString)),
this, SLOT(updateTranslatorComment(QString)));
- connect(m_findDialog, SIGNAL(findNext(QString,DataModel::FindLocation,bool,bool)),
- this, SLOT(findNext(QString,DataModel::FindLocation,bool,bool)));
+ connect(m_findDialog, SIGNAL(findNext(QString,DataModel::FindLocation,bool,bool,bool)),
+ this, SLOT(findNext(QString,DataModel::FindLocation,bool,bool,bool)));
connect(m_translateDialog, SIGNAL(requestMatchUpdate(bool&)), SLOT(updateTranslateHit(bool&)));
connect(m_translateDialog, SIGNAL(activated(int)), SLOT(translate(int)));
@@ -488,6 +489,7 @@
connect(m_ui.actionLengthVariants, SIGNAL(toggled(bool)),
m_messageEditor, SLOT(setLengthVariants(bool)));
m_messageEditor->setLengthVariants(m_ui.actionLengthVariants->isChecked());
+ m_messageEditor->setVisualizeWhitespace(m_ui.actionVisualizeWhitespace->isChecked());
m_focusWatcher = new FocusWatcher(m_messageEditor, this);
m_contextView->installEventFilter(m_focusWatcher);
@@ -993,6 +995,8 @@
bool hadMessage = false;
for (int i = 0; i < m_dataModel->modelCount(); ++i) {
if (MessageItem *m = m_dataModel->messageItem(dataIndex, i)) {
+ if (m_findSkipObsolete && m->isObsolete())
+ continue;
bool found = true;
do {
if (!hadMessage) {
@@ -1748,7 +1752,8 @@
return index.isValid();
}
-void MainWindow::findNext(const QString &text, DataModel::FindLocation where, bool matchCase, bool ignoreAccelerators)
+void MainWindow::findNext(const QString &text, DataModel::FindLocation where,
+ bool matchCase, bool ignoreAccelerators, bool skipObsolete)
{
if (text.isEmpty())
return;
@@ -1756,6 +1761,7 @@
m_findWhere = where;
m_findMatchCase = matchCase ? Qt::CaseSensitive : Qt::CaseInsensitive;
m_findIgnoreAccelerators = ignoreAccelerators;
+ m_findSkipObsolete = skipObsolete;
m_ui.actionFindNext->setEnabled(true);
findAgain();
}
@@ -1901,6 +1907,7 @@
connect(m_ui.actionResetSorting, SIGNAL(triggered()), this, SLOT(resetSorting()));
connect(m_ui.actionDisplayGuesses, SIGNAL(triggered()), m_phraseView, SLOT(toggleGuessing()));
connect(m_ui.actionStatistics, SIGNAL(triggered()), this, SLOT(toggleStatistics()));
+ connect(m_ui.actionVisualizeWhitespace, SIGNAL(triggered()), this, SLOT(toggleVisualizeWhitespace()));
connect(m_ui.menuView, SIGNAL(aboutToShow()), this, SLOT(updateViewMenu()));
m_ui.menuViewViews->addAction(m_contextDock->toggleViewAction());
m_ui.menuViewViews->addAction(m_messagesDock->toggleViewAction());
@@ -2567,6 +2574,11 @@
config.value(settingPath("Validators/PlaceMarkers"), true).toBool());
m_ui.actionLengthVariants->setChecked(
config.value(settingPath("Options/LengthVariants"), false).toBool());
+ m_ui.actionVisualizeWhitespace->setChecked(
+ config.value(settingPath("Options/VisualizeWhitespace"), true).toBool());
+
+ m_messageEditor->setFontSize(
+ config.value(settingPath("Options/EditorFontsize"), font().pointSize()).toReal());
recentFiles().readConfig();
@@ -2593,10 +2605,14 @@
m_ui.actionPlaceMarkerMatches->isChecked());
config.setValue(settingPath("Options/LengthVariants"),
m_ui.actionLengthVariants->isChecked());
+ config.setValue(settingPath("Options/VisualizeWhitespace"),
+ m_ui.actionVisualizeWhitespace->isChecked());
config.setValue(settingPath("MainWindowState"),
saveState());
recentFiles().writeConfig();
+ config.setValue(settingPath("Options/EditorFontsize"), m_messageEditor->fontSize());
+
config.beginWriteArray(settingPath("OpenedPhraseBooks"),
m_phraseBooks.size());
for (int i = 0; i < m_phraseBooks.size(); ++i) {
@@ -2645,6 +2661,11 @@
}
}
+void MainWindow::toggleVisualizeWhitespace()
+{
+ m_messageEditor->setVisualizeWhitespace(m_ui.actionVisualizeWhitespace->isChecked());
+}
+
void MainWindow::maybeUpdateStatistics(const MultiDataIndex &index)
{
if (index.model() == m_currentIndex.model())
@@ -2695,11 +2716,26 @@
e->acceptProposedAction();
return true;
} else if (event->type() == QEvent::KeyPress) {
- if (static_cast(event)->key() == Qt::Key_Escape) {
+ QKeyEvent *ke = static_cast(event);
+ if (ke->key() == Qt::Key_Escape) {
if (object == m_messageEditor)
m_messageView->setFocus();
else if (object == m_messagesDock)
m_contextView->setFocus();
+ } else if ((ke->key() == Qt::Key_Plus || ke->key() == Qt::Key_Equal)
+ && (ke->modifiers() & Qt::ControlModifier)) {
+ m_messageEditor->increaseFontSize();
+ } else if (ke->key() == Qt::Key_Minus
+ && (ke->modifiers() & Qt::ControlModifier)) {
+ m_messageEditor->decreaseFontSize();
+ }
+ } else if (event->type() == QEvent::Wheel) {
+ QWheelEvent *we = static_cast(event);
+ if (we->modifiers() & Qt::ControlModifier) {
+ if (we->delta() > 0)
+ m_messageEditor->increaseFontSize();
+ else
+ m_messageEditor->decreaseFontSize();
}
}
return false;
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/mainwindow.h qttools-opensource-src-5.3.0/src/linguist/linguist/mainwindow.h
--- qttools-opensource-src-5.2.1/src/linguist/linguist/mainwindow.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/mainwindow.h 2014-05-15 17:12:39.000000000 +0000
@@ -162,9 +162,11 @@
void toggleFinished(const QModelIndex &index);
void prevUnfinished();
void nextUnfinished();
- void findNext(const QString &text, DataModel::FindLocation where, bool matchCase, bool ignoreAccelerators);
+ void findNext(const QString &text, DataModel::FindLocation where,
+ bool matchCase, bool ignoreAccelerators, bool skipObsolete);
void revalidate();
void toggleStatistics();
+ void toggleVisualizeWhitespace();
void onWhatsThis();
void updatePhraseDicts();
void updatePhraseDict(int model);
@@ -235,6 +237,7 @@
QString m_findText;
Qt::CaseSensitivity m_findMatchCase;
bool m_findIgnoreAccelerators;
+ bool m_findSkipObsolete;
DataModel::FindLocation m_findWhere;
TranslateDialog *m_translateDialog;
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/mainwindow.ui qttools-opensource-src-5.3.0/src/linguist/linguist/mainwindow.ui
--- qttools-opensource-src-5.2.1/src/linguist/linguist/mainwindow.ui 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/mainwindow.ui 2014-05-15 17:12:39.000000000 +0000
@@ -117,6 +117,7 @@
+
@@ -886,6 +887,17 @@
Length Variants
+
+
+ true
+
+
+ Visualize whitespace
+
+
+ Toggle visualize whitespace in editors
+
+
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditor.cpp qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditor.cpp
--- qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditor.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditor.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -91,10 +91,12 @@
m_currentModel(-1),
m_currentNumerus(-1),
m_lengthVariants(false),
+ m_fontSize(font().pointSize()),
m_undoAvail(false),
m_redoAvail(false),
m_cutAvail(false),
m_copyAvail(false),
+ m_visualizeWhitespace(true),
m_selectionHolder(0),
m_focusWidget(0)
{
@@ -155,6 +157,8 @@
m_commentText->setWhatsThis(tr("This area shows a comment that"
" may guide you, and the context in which the text"
" occurs.") );
+ connect(m_commentText, SIGNAL(selectionChanged(QTextEdit*)),
+ SLOT(selectionChanged(QTextEdit*)));
QBoxLayout *subLayout = new QVBoxLayout;
@@ -197,7 +201,7 @@
m_editors.append(MessageEditorData());
MessageEditorData &ed = m_editors.last();
ed.pluralEditMode = false;
- ed.fontSize = font().pointSize();
+ ed.fontSize = m_fontSize;
ed.container = new QWidget;
if (model > 0) {
ed.container->setPalette(paletteForModel(model));
@@ -214,6 +218,7 @@
ed.transCommentText->setWhatsThis(tr("Here you can enter comments for your own use."
" They have no effect on the translated applications.") );
ed.transCommentText->getEditor()->installEventFilter(this);
+ ed.transCommentText->getEditor()->setVisualizeWhitespace(m_visualizeWhitespace);
connect(ed.transCommentText, SIGNAL(selectionChanged(QTextEdit*)),
SLOT(selectionChanged(QTextEdit*)));
connect(ed.transCommentText, SIGNAL(textChanged(QTextEdit*)),
@@ -288,16 +293,27 @@
void MessageEditor::editorCreated(QTextEdit *te)
{
+ QFont font;
+ font.setPointSize(static_cast(m_fontSize));
+
FormMultiWidget *snd = static_cast(sender());
for (int model = 0; ; ++model) {
MessageEditorData med = m_editors.at(model);
+ med.transCommentText->getEditor()->setFont(font);
if (med.transTexts.contains(snd)) {
- QFont font;
- font.setPointSize(static_cast(med.fontSize));
te->setFont(font);
te->installEventFilter(this);
+ if (m_visualizeWhitespace) {
+ QTextOption option = te->document()->defaultTextOption();
+
+ option.setFlags(option.flags()
+ | QTextOption::ShowLineAndParagraphSeparators
+ | QTextOption::ShowTabsAndSpaces);
+ te->document()->setDefaultTextOption(option);
+ }
+
fixTabOrder();
return;
}
@@ -491,33 +507,6 @@
return 0;
}
-static bool applyFont(MessageEditorData *med)
-{
- QFont font;
- font.setPointSize(static_cast(med->fontSize));
- for (int i = 0; i < med->transTexts.count(); ++i)
- foreach (QTextEdit *te, med->transTexts[i]->getEditors())
- te->setFont(font);
- med->transCommentText->getEditor()->setFont(font);
- return true;
-}
-
-static bool incFont(MessageEditorData *med)
-{
- if (!med || med->fontSize >= 32)
- return true;
- med->fontSize *= 1.2;
- return applyFont(med);
-}
-
-static bool decFont(MessageEditorData *med)
-{
- if (!med || med->fontSize <= 8)
- return true;
- med->fontSize /= 1.2;
- return applyFont(med);
-}
-
bool MessageEditor::eventFilter(QObject *o, QEvent *e)
{
// handle copying from the source
@@ -542,25 +531,12 @@
}
}
} else if (e->type() == QEvent::KeyPress) {
+ // Ctrl-Tab is still passed through to the textedit and causes a tab to be inserted.
QKeyEvent *ke = static_cast(e);
- if (ke->modifiers() & Qt::ControlModifier) {
- if (ke->key() == Qt::Key_Plus || ke->key() == Qt::Key_Equal)
- return incFont(modelForWidget(o));
- if (ke->key() == Qt::Key_Minus)
- return decFont(modelForWidget(o));
- } else {
- // Ctrl-Tab is still passed through to the textedit and causes a tab to be inserted.
- if (ke->key() == Qt::Key_Tab) {
- focusNextChild();
- return true;
- }
- }
- } else if (e->type() == QEvent::Wheel) {
- QWheelEvent *we = static_cast(e);
- if (we->modifiers() & Qt::ControlModifier) {
- if (we->delta() > 0)
- return incFont(modelForWidget(o));
- return decFont(modelForWidget(o));
+ if (ke->key() == Qt::Key_Tab &&
+ !(ke->modifiers() & Qt::ControlModifier)) {
+ focusNextChild();
+ return true;
}
} else if (e->type() == QEvent::FocusIn) {
QWidget *widget = static_cast(o);
@@ -912,4 +888,66 @@
return focusNextUnfinished(m_currentModel + 1);
}
+void MessageEditor::setVisualizeWhitespace(bool value)
+{
+ m_visualizeWhitespace = value;
+ m_source->getEditor()->setVisualizeWhitespace(value);
+ m_pluralSource->getEditor()->setVisualizeWhitespace(value);
+ m_commentText->getEditor()->setVisualizeWhitespace(value);
+
+ foreach (const MessageEditorData &med, m_editors) {
+ med.transCommentText->getEditor()->setVisualizeWhitespace(value);
+ foreach (FormMultiWidget *widget, med.transTexts)
+ foreach (FormatTextEdit *te, widget->getEditors())
+ te->setVisualizeWhitespace(value);
+ }
+}
+
+void MessageEditor::setFontSize(const float fontSize)
+{
+ if (m_fontSize != fontSize) {
+ m_fontSize = fontSize;
+ applyFontSize();
+ }
+}
+
+float MessageEditor::fontSize()
+{
+ return m_fontSize;
+}
+
+void MessageEditor::applyFontSize()
+{
+ QFont font;
+ font.setPointSize(static_cast(m_fontSize));
+
+ m_source->getEditor()->setFont(font);
+ m_pluralSource->getEditor()->setFont(font);
+ m_commentText->getEditor()->setFont(font);
+
+ foreach (MessageEditorData med, m_editors) {
+ for (int i = 0; i < med.transTexts.count(); ++i)
+ foreach (QTextEdit *te, med.transTexts[i]->getEditors())
+ te->setFont(font);
+ med.transCommentText->getEditor()->setFont(font);
+ }
+}
+
+void MessageEditor::increaseFontSize()
+{
+ if (m_fontSize >= 32)
+ return;
+
+ m_fontSize *= 1.2f;
+ applyFontSize();
+}
+
+void MessageEditor::decreaseFontSize()
+{
+ if (m_fontSize > 8) {
+ m_fontSize /= 1.2f;
+ applyFontSize();
+ }
+}
+
QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditor.h qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditor.h
--- qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditor.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditor.h 2014-05-15 17:12:39.000000000 +0000
@@ -87,6 +87,11 @@
void setEditorFocus(int model);
void setUnfinishedEditorFocus();
bool focusNextUnfinished();
+ void setVisualizeWhitespace(bool value);
+ void setFontSize(const float fontSize);
+ float fontSize();
+ void increaseFontSize();
+ void decreaseFontSize();
signals:
void translationChanged(const QStringList &translations);
@@ -157,6 +162,7 @@
void addPluralForm(int model, const QString &label, bool writable);
void fixTabOrder();
QPalette paletteForModel(int model) const;
+ void applyFontSize();
MultiDataModel *m_dataModel;
@@ -165,6 +171,7 @@
int m_currentNumerus;
bool m_lengthVariants;
+ float m_fontSize;
bool m_undoAvail;
bool m_redoAvail;
@@ -172,6 +179,7 @@
bool m_copyAvail;
bool m_clipboardEmpty;
+ bool m_visualizeWhitespace;
QTextEdit *m_selectionHolder;
QWidget *m_focusWidget;
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditorwidgets.cpp qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditorwidgets.cpp
--- qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditorwidgets.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditorwidgets.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -114,11 +114,6 @@
{
setLineWrapMode(QTextEdit::WidgetWidth);
setAcceptRichText(false);
- QTextOption option = document()->defaultTextOption();
- option.setFlags(option.flags()
- | QTextOption::ShowLineAndParagraphSeparators
- | QTextOption::ShowTabsAndSpaces);
- document()->setDefaultTextOption(option);
// Do not set different background if disabled
QPalette p = palette();
@@ -168,6 +163,21 @@
}
}
+void FormatTextEdit::setVisualizeWhitespace(bool value)
+{
+ QTextOption option = document()->defaultTextOption();
+ if (value) {
+ option.setFlags(option.flags()
+ | QTextOption::ShowLineAndParagraphSeparators
+ | QTextOption::ShowTabsAndSpaces);
+ } else {
+ option.setFlags(option.flags()
+ & ~QTextOption::ShowLineAndParagraphSeparators
+ & ~QTextOption::ShowTabsAndSpaces);
+ }
+ document()->setDefaultTextOption(option);
+}
+
FormWidget::FormWidget(const QString &label, bool isEditable, QWidget *parent)
: QWidget(parent),
m_hideWhenEmpty(false)
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditorwidgets.h qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditorwidgets.h
--- qttools-opensource-src-5.2.1/src/linguist/linguist/messageeditorwidgets.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist/messageeditorwidgets.h 2014-05-15 17:12:39.000000000 +0000
@@ -99,6 +99,7 @@
public slots:
void setPlainText(const QString & text, bool userAction);
+ void setVisualizeWhitespace(bool value);
private:
MessageHighlighter *m_highlighter;
diff -Nru qttools-opensource-src-5.2.1/src/linguist/linguist.pro qttools-opensource-src-5.3.0/src/linguist/linguist.pro
--- qttools-opensource-src-5.2.1/src/linguist/linguist.pro 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/linguist.pro 2014-05-15 17:12:39.000000000 +0000
@@ -9,7 +9,7 @@
linguist \
)
-win32:CMAKE_BIN_SUFFIX = ".exe"
+equals(QMAKE_HOST.os, Windows): CMAKE_BIN_SUFFIX = ".exe"
load(cmake_functions)
@@ -18,10 +18,10 @@
CMAKE_LIB_DIR = $$cmakeRelativePath($$[QT_INSTALL_LIBS], $$[QT_INSTALL_PREFIX])
!contains(CMAKE_LIB_DIR,"^\\.\\./.*") {
- CMAKE_RELATIVE_INSTALL_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
+ CMAKE_RELATIVE_INSTALL_LIBS_DIR = $$cmakeRelativePath($$[QT_INSTALL_PREFIX], $$[QT_INSTALL_LIBS])
# We need to go up another two levels because the CMake files are
# installed in $${CMAKE_LIB_DIR}/cmake/Qt5$${CMAKE_MODULE_NAME}
- CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_DIR}../../"
+ CMAKE_RELATIVE_INSTALL_DIR = "$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}../../"
} else {
CMAKE_LIB_DIR_IS_ABSOLUTE = True
}
diff -Nru qttools-opensource-src-5.2.1/src/linguist/lrelease/lrelease.1 qttools-opensource-src-5.3.0/src/linguist/lrelease/lrelease.1
--- qttools-opensource-src-5.2.1/src/linguist/lrelease/lrelease.1 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/lrelease/lrelease.1 2014-05-15 17:12:39.000000000 +0000
@@ -36,7 +36,7 @@
.\"
.\"
.\" $QT_END_LICENSE$
-.\"
+.\"
.SH NAME
lrelease \- generate Qt message files from Qt Linguist translation files
.SH SYNOPSIS
diff -Nru qttools-opensource-src-5.2.1/src/linguist/lupdate/java.cpp qttools-opensource-src-5.3.0/src/linguist/lupdate/java.cpp
--- qttools-opensource-src-5.2.1/src/linguist/lupdate/java.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/lupdate/java.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -305,11 +305,11 @@
if (yyCh == QLatin1Char('+')) {
yyCh = getChar();
return Tok_PlusPlus;
- }
+ }
if( yyCh == QLatin1Char('=') ){
yyCh = getChar();
return Tok_PlusEq;
- }
+ }
return Tok_Plus;
case '0':
case '1':
diff -Nru qttools-opensource-src-5.2.1/src/linguist/lupdate/lupdate.exe.manifest qttools-opensource-src-5.3.0/src/linguist/lupdate/lupdate.exe.manifest
--- qttools-opensource-src-5.2.1/src/linguist/lupdate/lupdate.exe.manifest 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/lupdate/lupdate.exe.manifest 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
diff -Nru qttools-opensource-src-5.2.1/src/linguist/lupdate/lupdate.pro qttools-opensource-src-5.3.0/src/linguist/lupdate/lupdate.pro
--- qttools-opensource-src-5.2.1/src/linguist/lupdate/lupdate.pro 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/lupdate/lupdate.pro 2014-05-15 17:12:39.000000000 +0000
@@ -29,6 +29,10 @@
lupdate.h \
../shared/simtexth.h
+mingw {
+ RC_FILE = lupdate.rc
+}
+
qmake.name = QMAKE
qmake.value = $$shell_path($$QMAKE_QMAKE)
QT_TOOL_ENV += qmake
diff -Nru qttools-opensource-src-5.2.1/src/linguist/lupdate/lupdate.rc qttools-opensource-src-5.3.0/src/linguist/lupdate/lupdate.rc
--- qttools-opensource-src-5.2.1/src/linguist/lupdate/lupdate.rc 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/lupdate/lupdate.rc 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,4 @@
+#define RT_MANIFEST 24
+#define CREATEPROCESS_MANIFEST_RESOURCE_ID 1
+
+CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST "lupdate.exe.manifest"
diff -Nru qttools-opensource-src-5.2.1/src/linguist/qdoc.conf qttools-opensource-src-5.3.0/src/linguist/qdoc.conf
--- qttools-opensource-src-5.2.1/src/linguist/qdoc.conf 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/qdoc.conf 2014-05-15 17:12:39.000000000 +0000
@@ -1,15 +1,15 @@
-SOURCEDIRS = $QTDIR/tools/linguist/doc
+SOURCEDIRS = $QTDIR/tools/linguist/doc
DOCDIRS = $QTDIR/tools/linguist/doc
EXAMPLEDIRS = $QTDIR/tools/linguist/tutorial
-OUTPUTDIR = $QTDIR/tools/linguist/doc/html
-BASE = file:$QTDIR/tools/linguist/doc/html/
+OUTPUTDIR = $QTDIR/tools/linguist/doc/html
+BASE = file:$QTDIR/tools/linguist/doc/html/
COMPANY = Digia Plc and/or its subsidiary(-ies)
-PRODUCT = Qt Linguist
-VERSIONSYM = QT_VERSION_STR
-DEFINE = QT_QDOC QT_.*_SUPPORT _WS_.*_
-FALSE = 0 1
-INTERNAL = no
-STYLE = "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
+PRODUCT = Qt Linguist
+VERSIONSYM = QT_VERSION_STR
+DEFINE = QT_QDOC QT_.*_SUPPORT _WS_.*_
+FALSE = 0 1
+INTERNAL = no
+STYLE = "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }
a:link { color: #af4f00; text-decoration: none }
a:visited { color: #8f2f00; text-decoration: none }
body { background: #ffffff; color: black; }"
diff -Nru qttools-opensource-src-5.2.1/src/linguist/Qt5LinguistToolsConfig.cmake.in qttools-opensource-src-5.3.0/src/linguist/Qt5LinguistToolsConfig.cmake.in
--- qttools-opensource-src-5.2.1/src/linguist/Qt5LinguistToolsConfig.cmake.in 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/Qt5LinguistToolsConfig.cmake.in 2014-05-15 17:12:39.000000000 +0000
@@ -13,7 +13,7 @@
get_filename_component(_realCurr \"${_IMPORT_PREFIX}\" REALPATH)
get_filename_component(_realOrig \"$$CMAKE_INSTALL_LIBS_DIR/cmake/Qt5LinguistTools\" REALPATH)
if(_realCurr STREQUAL _realOrig)
- get_filename_component(_qt5_linguisttools_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR\" PATH)
+ get_filename_component(_qt5_linguisttools_install_prefix \"$$CMAKE_INSTALL_LIBS_DIR/$${CMAKE_RELATIVE_INSTALL_LIBS_DIR}\" ABSOLUTE)
else()
get_filename_component(_qt5_linguisttools_install_prefix \"${CMAKE_CURRENT_LIST_DIR}/$${CMAKE_RELATIVE_INSTALL_DIR}\" ABSOLUTE)
endif()
diff -Nru qttools-opensource-src-5.2.1/src/linguist/shared/formats.pri qttools-opensource-src-5.3.0/src/linguist/shared/formats.pri
--- qttools-opensource-src-5.2.1/src/linguist/shared/formats.pri 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/shared/formats.pri 2014-05-15 17:12:39.000000000 +0000
@@ -19,4 +19,4 @@
$$PWD/qph.cpp \
$$PWD/po.cpp \
$$PWD/ts.cpp \
- $$PWD/xliff.cpp
+ $$PWD/xliff.cpp
diff -Nru qttools-opensource-src-5.2.1/src/linguist/shared/qmakeevaluator.cpp qttools-opensource-src-5.3.0/src/linguist/shared/qmakeevaluator.cpp
--- qttools-opensource-src-5.2.1/src/linguist/shared/qmakeevaluator.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/shared/qmakeevaluator.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -894,30 +894,9 @@
default: // whatever - cannot happen
case TokAssign: // =
zipEmpty(&varVal);
- if (!m_cumulative) {
- // FIXME: add check+warning about accidental value removal.
- // This may be a bit too noisy, though.
- m_valuemapStack.top()[varName] = varVal;
- } else {
- if (!varVal.isEmpty()) {
- // We are greedy for values. But avoid exponential growth.
- ProStringList &v = valuesRef(varName);
- if (v.isEmpty()) {
- v = varVal;
- } else {
- ProStringList old = v;
- v = varVal;
- QSet has;
- has.reserve(v.size());
- foreach (const ProString &s, v)
- has.insert(s);
- v.reserve(v.size() + old.size());
- foreach (const ProString &s, old)
- if (!has.contains(s))
- v << s;
- }
- }
- }
+ // FIXME: add check+warning about accidental value removal.
+ // This may be a bit too noisy, though.
+ m_valuemapStack.top()[varName] = varVal;
debugMsg(2, "assigning");
break;
case TokAppendUnique: // *=
@@ -933,7 +912,7 @@
if (!m_cumulative) {
removeEach(&valuesRef(varName), varVal);
} else {
- // We are stingy with our values, too.
+ // We are stingy with our values.
}
debugMsg(2, "removing");
break;
@@ -1123,28 +1102,7 @@
}
no_cache:
- // Look for mkspecs/ in source and build. First to win determines the root.
- QString sdir = inDir;
QString dir = m_outputDir;
- while (dir != m_buildRoot) {
- if ((dir != sdir && QFileInfo(sdir, QLatin1String("mkspecs")).isDir())
- || QFileInfo(dir, QLatin1String("mkspecs")).isDir()) {
- if (dir != sdir)
- m_sourceRoot = sdir;
- m_buildRoot = dir;
- break;
- }
- if (dir == superdir)
- break;
- QFileInfo qsdfi(sdir);
- QFileInfo qdfi(dir);
- if (qsdfi.isRoot() || qdfi.isRoot())
- break;
- sdir = qsdfi.path();
- dir = qdfi.path();
- }
-
- dir = m_outputDir;
forever {
QString stashfile = dir + QLatin1String("/.qmake.stash");
if (dir == (!superdir.isEmpty() ? superdir : m_buildRoot) || m_vfs->exists(stashfile)) {
@@ -1876,14 +1834,12 @@
VisitReturn ok = visitProFile(pro, type, flags);
m_current = m_locationStack.pop();
pro->deref();
-#ifdef PROEVALUATOR_FULL
if (ok == ReturnTrue && !(flags & LoadHidden)) {
ProStringList &iif = m_valuemapStack.first()[ProKey("QMAKE_INTERNAL_INCLUDED_FILES")];
ProString ifn(fileName);
if (!iif.contains(ifn))
iif << ifn;
}
-#endif
return ok;
} else {
return ReturnFalse;
@@ -1996,13 +1952,11 @@
if (ret != ReturnTrue)
return ret;
*values = visitor.m_valuemapStack.top();
-#ifdef PROEVALUATOR_FULL
ProKey qiif("QMAKE_INTERNAL_INCLUDED_FILES");
ProStringList &iif = m_valuemapStack.first()[qiif];
foreach (const ProString &ifn, values->value(qiif))
if (!iif.contains(ifn))
iif << ifn;
-#endif
return ReturnTrue;
}
diff -Nru qttools-opensource-src-5.2.1/src/linguist/shared/simtexth.h qttools-opensource-src-5.3.0/src/linguist/shared/simtexth.h
--- qttools-opensource-src-5.2.1/src/linguist/shared/simtexth.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/shared/simtexth.h 2014-05-15 17:12:39.000000000 +0000
@@ -55,7 +55,7 @@
{
Candidate() {}
Candidate(const QString& source0, const QString &target0)
- : source(source0), target(target0)
+ : source(source0), target(target0)
{}
QString source;
@@ -115,8 +115,8 @@
}
CandidateList similarTextHeuristicCandidates( const Translator *tor,
- const QString &text,
- int maxCandidates );
+ const QString &text,
+ int maxCandidates );
QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/linguist/shared/ts.dtd qttools-opensource-src-5.3.0/src/linguist/shared/ts.dtd
--- qttools-opensource-src-5.2.1/src/linguist/shared/ts.dtd 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/linguist/shared/ts.dtd 2014-05-15 17:12:39.000000000 +0000
@@ -1,5 +1,5 @@
-
-
@@ -72,7 +72,7 @@
! For subsequent locations, it is the filename used for the previous location.
! A single TS file has either all absolute or all relative locations.
-->
-
diff -Nru qttools-opensource-src-5.2.1/src/macdeployqt/macdeployqt/main.cpp qttools-opensource-src-5.3.0/src/macdeployqt/macdeployqt/main.cpp
--- qttools-opensource-src-5.2.1/src/macdeployqt/macdeployqt/main.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/macdeployqt/macdeployqt/main.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -58,6 +58,7 @@
qDebug() << " -use-debug-libs : Deploy with debug versions of frameworks and plugins (implies -no-strip)";
qDebug() << " -executable= : Let the given executable use the deployed frameworks too";
qDebug() << " -qmldir= : Deploy imports used by .qml files in the given path";
+ qDebug() << " -always-overwrite : Copy files enven if the target file exists";
qDebug() << "";
qDebug() << "macdeployqt takes an application bundle as input and makes it";
qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
@@ -85,6 +86,7 @@
bool dmg = false;
bool useDebugLibs = false;
extern bool runStripEnabled;
+ extern bool alwaysOwerwriteEnabled;
QStringList additionalExecutables;
QStringList qmlDirs;
@@ -126,6 +128,9 @@
LogError() << "Missing qml directory path";
else
qmlDirs << argument.mid(index+1);
+ } else if (argument == QByteArray("-always-overwrite")) {
+ LogDebug() << "Argument found:" << argument;
+ alwaysOwerwriteEnabled = true;
} else if (argument.startsWith("-")) {
LogError() << "Unknown argument" << argument << "\n";
return 0;
@@ -134,12 +139,8 @@
DeploymentInfo deploymentInfo = deployQtFrameworks(appBundlePath, additionalExecutables, useDebugLibs);
- if (plugins) {
- if (deploymentInfo.qtPath.isEmpty())
- deploymentInfo.pluginPath = "/Developer/Applications/Qt/plugins"; // Assume binary package.
- else
- deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
-
+ if (plugins && !deploymentInfo.qtPath.isEmpty()) {
+ deploymentInfo.pluginPath = deploymentInfo.qtPath + "/plugins";
LogNormal();
deployPlugins(appBundlePath, deploymentInfo, useDebugLibs);
createQtConf(appBundlePath);
diff -Nru qttools-opensource-src-5.2.1/src/macdeployqt/shared/shared.cpp qttools-opensource-src-5.3.0/src/macdeployqt/shared/shared.cpp
--- qttools-opensource-src-5.2.1/src/macdeployqt/shared/shared.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/macdeployqt/shared/shared.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -55,6 +55,7 @@
#include "shared.h"
bool runStripEnabled = true;
+bool alwaysOwerwriteEnabled = false;
int logLevel = 1;
using std::cout;
@@ -96,13 +97,32 @@
bool copyFilePrintStatus(const QString &from, const QString &to)
{
if (QFile(to).exists()) {
- LogNormal() << "File exists, skip copy:" << to;
- return false;
- } else if (QFile::copy(from, to)) {
+ if (alwaysOwerwriteEnabled) {
+ QFile(to).remove();
+ } else {
+ qDebug() << "File exists, skip copy:" << to;
+ return false;
+ }
+ }
+
+ if (QFile::copy(from, to)) {
QFile dest(to);
dest.setPermissions(dest.permissions() | QFile::WriteOwner | QFile::WriteUser);
LogNormal() << " copied:" << from;
LogNormal() << " to" << to;
+
+ // The source file might not have write permissions set. Set the
+ // write permission on the target file to make sure we can use
+ // install_name_tool on it later.
+ QFile toFile(to);
+ if (toFile.permissions() & QFile::WriteOwner)
+ return true;
+
+ if (!toFile.setPermissions(toFile.permissions() | QFile::WriteOwner)) {
+ LogError() << "Failed to set u+w permissions on target file: " << to;
+ return false;
+ }
+
return true;
} else {
LogError() << "file copy failed from" << from;
@@ -371,7 +391,7 @@
return QString();
}
- if (!QFile::exists(to)) { // copy the binary and resources if that wasn't done before
+ if (!QFile::exists(to) || alwaysOwerwriteEnabled) { // copy the binary and resources if that wasn't done before
copyFilePrintStatus(from, to);
const QString resourcesSourcePath = framework.frameworkPath + "/Resources";
@@ -519,7 +539,7 @@
QStringList allBinaryPaths = QStringList() << applicationBundle.binaryPath << applicationBundle.libraryPaths
<< additionalExecutables;
QList frameworks = getQtFrameworksForPaths(allBinaryPaths, useDebugLibs);
- if (frameworks.isEmpty()) {
+ if (frameworks.isEmpty() && !alwaysOwerwriteEnabled) {
LogWarning();
LogWarning() << "Could not find any external Qt frameworks to deploy in" << appBundlePath;
LogWarning() << "Perhaps macdeployqt was already used on" << appBundlePath << "?";
@@ -623,7 +643,7 @@
QDir().mkpath(filePath);
QFile qtconf(fileName);
- if (qtconf.exists()) {
+ if (qtconf.exists() && !alwaysOwerwriteEnabled) {
LogWarning();
LogWarning() << fileName << "already exists, will not overwrite.";
LogWarning() << "To make sure the plugins are loaded from the correct location,";
@@ -752,6 +772,9 @@
QFile dmg(dmgName);
+ if (dmg.exists() && alwaysOwerwriteEnabled)
+ dmg.remove();
+
if (dmg.exists()) {
LogNormal() << "Disk image already exists, skipping .dmg creation for" << dmg.fileName();
} else {
diff -Nru qttools-opensource-src-5.2.1/src/macdeployqt/tests/tst_deployment_mac.cpp qttools-opensource-src-5.3.0/src/macdeployqt/tests/tst_deployment_mac.cpp
--- qttools-opensource-src-5.2.1/src/macdeployqt/tests/tst_deployment_mac.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/macdeployqt/tests/tst_deployment_mac.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -55,10 +55,10 @@
{
{
QString line = " /Users/foo/build/qt-4.4/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.4.0, current version 4.4.0)";
- FrameworkInfo info = parseOtoolLibraryLine(line);
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
// qDebug() << info;
- QCOMPARE(info.frameworkDirectory, QLatin1String("/Users/foo/build/qt-4.4/lib/"));
- QCOMPARE(info.frameworkName, QLatin1String("QtGui.framework"));
+ QCOMPARE(info.frameworkDirectory, QLatin1String("/Users/foo/build/qt-4.4/lib/"));
+ QCOMPARE(info.frameworkName, QLatin1String("QtGui.framework"));
QCOMPARE(info.frameworkPath, QLatin1String("/Users/foo/build/qt-4.4/lib/QtGui.framework"));
QCOMPARE(info.binaryDirectory, QLatin1String("Versions/4"));
QCOMPARE(info.binaryName, QLatin1String("QtGui"));
@@ -71,10 +71,10 @@
}
{
QString line = " /Users/foo/build/qt-4.4/lib/phonon.framework/Versions/4/phonon (compatibility version 4.1.0, current version 4.1.0)";
- FrameworkInfo info = parseOtoolLibraryLine(line);
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
// qDebug() << info;
- QCOMPARE(info.frameworkDirectory, QLatin1String("/Users/foo/build/qt-4.4/lib/"));
- QCOMPARE(info.frameworkName, QLatin1String("phonon.framework"));
+ QCOMPARE(info.frameworkDirectory, QLatin1String("/Users/foo/build/qt-4.4/lib/"));
+ QCOMPARE(info.frameworkName, QLatin1String("phonon.framework"));
QCOMPARE(info.frameworkPath, QLatin1String("/Users/foo/build/qt-4.4/lib/phonon.framework"));
QCOMPARE(info.binaryDirectory, QLatin1String("Versions/4"));
QCOMPARE(info.binaryName, QLatin1String("phonon"));
@@ -88,10 +88,10 @@
{
QString line = " /usr/local/Qt-4.4.0/lib/phonon.framework/Versions/4/phonon (compatibility version 4.1.0, current version 4.1.0)";
- FrameworkInfo info = parseOtoolLibraryLine(line);
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
// qDebug() << info;
- QCOMPARE(info.frameworkDirectory, QLatin1String("/usr/local/Qt-4.4.0/lib/"));
- QCOMPARE(info.frameworkName, QLatin1String("phonon.framework"));
+ QCOMPARE(info.frameworkDirectory, QLatin1String("/usr/local/Qt-4.4.0/lib/"));
+ QCOMPARE(info.frameworkName, QLatin1String("phonon.framework"));
QCOMPARE(info.frameworkPath, QLatin1String("/usr/local/Qt-4.4.0/lib/phonon.framework"));
QCOMPARE(info.binaryDirectory, QLatin1String("Versions/4"));
QCOMPARE(info.binaryName, QLatin1String("phonon"));
@@ -105,10 +105,10 @@
{
QString line = " QtGui.framework/Versions/4/QtGui (compatibility version 4.1.0, current version 4.1.0)";
- FrameworkInfo info = parseOtoolLibraryLine(line);
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
// qDebug() << info;
- QCOMPARE(info.frameworkDirectory, QLatin1String("/Library/Frameworks/"));
- QCOMPARE(info.frameworkName, QLatin1String("QtGui.framework"));
+ QCOMPARE(info.frameworkDirectory, QLatin1String("/Library/Frameworks/"));
+ QCOMPARE(info.frameworkName, QLatin1String("QtGui.framework"));
QCOMPARE(info.frameworkPath, QLatin1String("/Library/Frameworks/QtGui.framework"));
QCOMPARE(info.binaryDirectory, QLatin1String("Versions/4"));
QCOMPARE(info.binaryName, QLatin1String("QtGui"));
@@ -122,10 +122,10 @@
{
QString line = " phonon.framework/Versions/4/QtGui (compatibility version 4.1.0, current version 4.1.0)";
- FrameworkInfo info = parseOtoolLibraryLine(line);
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
// qDebug() << info;
- QCOMPARE(info.frameworkDirectory, QLatin1String("/Library/Frameworks/"));
- QCOMPARE(info.frameworkName, QLatin1String("phonon.framework"));
+ QCOMPARE(info.frameworkDirectory, QLatin1String("/Library/Frameworks/"));
+ QCOMPARE(info.frameworkName, QLatin1String("phonon.framework"));
QCOMPARE(info.frameworkPath, QLatin1String("/Library/Frameworks/phonon.framework"));
QCOMPARE(info.binaryDirectory, QLatin1String("Versions/4"));
QCOMPARE(info.binaryName, QLatin1String("phonon"));
@@ -139,11 +139,11 @@
{
QString line = " /Users/foo/build/qt-4.4/lib/libQtCLucene.4.dylib (compatibility version 4.4.0, current version 4.4.0)";
- FrameworkInfo info = parseOtoolLibraryLine(line);
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
// qDebug() << info;
- QCOMPARE(info.frameworkDirectory, QLatin1String("/Users/foo/build/qt-4.4/lib/"));
+ QCOMPARE(info.frameworkDirectory, QLatin1String("/Users/foo/build/qt-4.4/lib/"));
QCOMPARE(info.binaryName, QLatin1String("libQtCLucene.4.dylib"));
- QCOMPARE(info.frameworkName, QLatin1String("libQtCLucene.4.dylib"));
+ QCOMPARE(info.frameworkName, QLatin1String("libQtCLucene.4.dylib"));
QCOMPARE(info.frameworkPath, QLatin1String("/Users/foo/build/qt-4.4/lib/libQtCLucene.4.dylib"));
QCOMPARE(info.installName, QLatin1String("/Users/foo/build/qt-4.4/lib/libQtCLucene.4.dylib"));
QCOMPARE(info.deployedInstallName, QLatin1String("@executable_path/../Frameworks/libQtCLucene.4.dylib"));
@@ -152,11 +152,11 @@
}
{
QString line = "libQtCLucene.4.dylib (compatibility version 4.4.0, current version 4.4.0)";
- FrameworkInfo info = parseOtoolLibraryLine(line);
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
// qDebug() << info;
- QCOMPARE(info.frameworkDirectory, QLatin1String("/usr/lib/"));
+ QCOMPARE(info.frameworkDirectory, QLatin1String("/usr/lib/"));
QCOMPARE(info.binaryName, QLatin1String("libQtCLucene.4.dylib"));
- QCOMPARE(info.frameworkName, QLatin1String("libQtCLucene.4.dylib"));
+ QCOMPARE(info.frameworkName, QLatin1String("libQtCLucene.4.dylib"));
QCOMPARE(info.frameworkPath, QLatin1String("/usr/lib/libQtCLucene.4.dylib"));
QCOMPARE(info.installName, QLatin1String("libQtCLucene.4.dylib"));
QCOMPARE(info.deployedInstallName, QLatin1String("@executable_path/../Frameworks/libQtCLucene.4.dylib"));
@@ -165,8 +165,8 @@
}
{
QString line = "/foo"; //invalid
- FrameworkInfo info = parseOtoolLibraryLine(line);
- QCOMPARE(info.frameworkName, QString());
+ FrameworkInfo info = parseOtoolLibraryLine(line, false);
+ QCOMPARE(info.frameworkName, QString());
}
}
@@ -175,19 +175,19 @@
{
{
QStringList otool = QStringList()
- << "/Users/foo/build/qt-4.4/lib/phonon.framework/Versions/4/phonon (compatibility version 4.1.0, current version 4.1.0)"
- << "/Users/foo/build/qt-4.4/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.4.0, current version 4.4.0)"
- << "/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 136.0.0)"
- << "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 949.27.0)"
- << "/Users/foo/build/qt-4.4/lib/QtCore.framework/Versions/4/QtCore (compatibility version 4.4.0, current version 4.4.0)"
- << "/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.3)"
- << "/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 111.0.0)"
- << "/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 7.4.0)"
- << "/usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 1.0.0)"
+ << "/Users/foo/build/qt-4.4/lib/phonon.framework/Versions/4/phonon (compatibility version 4.1.0, current version 4.1.0)"
+ << "/Users/foo/build/qt-4.4/lib/QtGui.framework/Versions/4/QtGui (compatibility version 4.4.0, current version 4.4.0)"
+ << "/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 136.0.0)"
+ << "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 949.27.0)"
+ << "/Users/foo/build/qt-4.4/lib/QtCore.framework/Versions/4/QtCore (compatibility version 4.4.0, current version 4.4.0)"
+ << "/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.3)"
+ << "/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 111.0.0)"
+ << "/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 7.4.0)"
+ << "/usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 1.0.0)"
<< " "
;
-
- QList frameworks = getQtFrameworks(otool);
+
+ QList frameworks = getQtFrameworks(otool, false);
QCOMPARE(frameworks.count(), 3);
QCOMPARE(frameworks.at(0).binaryName, QLatin1String("phonon"));
QCOMPARE(frameworks.at(1).binaryName, QLatin1String("QtGui"));
@@ -196,21 +196,21 @@
{
QStringList otool = QStringList()
<< "QtHelp.framework/Versions/4/QtHelp (compatibility version 4.4.0, current version 4.4.0)"
- << "libQtCLucene.4.dylib (compatibility version 4.4.0, current version 4.4.0)"
- << "QtSql.framework/Versions/4/QtSql (compatibility version 4.4.0, current version 4.4.0)"
- << "QtXml.framework/Versions/4/QtXml (compatibility version 4.4.0, current version 4.4.0)"
- << "QtGui.framework/Versions/4/QtGui (compatibility version 4.4.0, current version 4.4.0)"
- << "/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 128.0.0)"
- << "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 824.42.0)"
- << "QtNetwork.framework/Versions/4/QtNetwork (compatibility version 4.4.0, current version 4.4.0)"
- << "QtCore.framework/Versions/4/QtCore (compatibility version 4.4.0, current version 4.4.0)"
- << "/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.3)"
- << "/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 88.3.6)"
- << "/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 7.4.0)"
- << "/usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 1.0.0)"
+ << "libQtCLucene.4.dylib (compatibility version 4.4.0, current version 4.4.0)"
+ << "QtSql.framework/Versions/4/QtSql (compatibility version 4.4.0, current version 4.4.0)"
+ << "QtXml.framework/Versions/4/QtXml (compatibility version 4.4.0, current version 4.4.0)"
+ << "QtGui.framework/Versions/4/QtGui (compatibility version 4.4.0, current version 4.4.0)"
+ << "/System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 128.0.0)"
+ << "/System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 824.42.0)"
+ << "QtNetwork.framework/Versions/4/QtNetwork (compatibility version 4.4.0, current version 4.4.0)"
+ << "QtCore.framework/Versions/4/QtCore (compatibility version 4.4.0, current version 4.4.0)"
+ << "/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.3)"
+ << "/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 88.3.6)"
+ << "/usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 7.4.0)"
+ << "/usr/lib/libgcc_s.1.dylib (compatibility version 1.0.0, current version 1.0.0)"
;
- QList frameworks = getQtFrameworks(otool);
+ QList frameworks = getQtFrameworks(otool, false);
QCOMPARE(frameworks.count(), 7);
QCOMPARE(frameworks.at(0).binaryName, QLatin1String("QtHelp"));
QCOMPARE(frameworks.at(1).binaryName, QLatin1String("libQtCLucene.4.dylib"));
diff -Nru qttools-opensource-src-5.2.1/src/makeqpf/Blocks.txt qttools-opensource-src-5.3.0/src/makeqpf/Blocks.txt
--- qttools-opensource-src-5.2.1/src/makeqpf/Blocks.txt 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/makeqpf/Blocks.txt 2014-05-15 17:12:39.000000000 +0000
@@ -17,13 +17,13 @@
# Note: When comparing block names, casing, whitespace, hyphens,
# and underbars are ignored.
# For example, "Latin Extended-A" and "latin extended a" are equivalent.
-# For more information on the comparison of property values,
+# For more information on the comparison of property values,
# see UCD.html.
#
# All code points not explicitly listed for Block
# have the value No_Block.
-# Property: Block
+# Property: Block
#
# @missing: 0000..10FFFF; No_Block
diff -Nru qttools-opensource-src-5.2.1/src/makeqpf/qpf2.cpp qttools-opensource-src-5.3.0/src/makeqpf/qpf2.cpp
--- qttools-opensource-src-5.2.1/src/makeqpf/qpf2.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/makeqpf/qpf2.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -490,8 +490,8 @@
QByteArray glyphs;
if (options & RenderGlyphs) {
// this is only a rough estimation
- glyphs.reserve(glyphCount
- * (sizeof(QFontEngineQPF::Glyph)
+ glyphs.reserve(glyphCount
+ * (sizeof(QFontEngineQPF::Glyph)
+ qRound(fe->maxCharWidth() * (fe->ascent() + fe->descent()).toReal())));
QGlyphLayoutArray<10> layout;
@@ -638,7 +638,7 @@
{
const QFontEngineQPF::Header *header = reinterpret_cast(data);
qDebug() << "Header:";
- qDebug() << "magic ="
+ qDebug() << "magic ="
<< header->magic[0]
<< header->magic[1]
<< header->magic[2]
diff -Nru qttools-opensource-src-5.2.1/src/qconfig/feature.cpp qttools-opensource-src-5.3.0/src/qconfig/feature.cpp
--- qttools-opensource-src-5.2.1/src/qconfig/feature.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qconfig/feature.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -74,7 +74,7 @@
static QString listToHtml(const QString &title, const QStringList &list)
{
if (list.isEmpty())
- return QString();
+ return QString();
QString str;
QTextStream stream(&str);
@@ -82,7 +82,7 @@
stream << "" << title << ":
";
stream << "";
foreach (QString l, list)
- stream << "- " << l << "
";
+ stream << "- " << l << "
";
stream << "
";
return str;
@@ -131,13 +131,13 @@
const QString linkColor = QApplication::palette().color(QPalette::Link).name();
stream << ""
<< key() << "
"
- << "" << title() << "
";
+ << "" << title() << "
";
if (!description().isEmpty())
stream << "" << description() << "
";
stream << listToHtml("Section", QStringList(section()))
- << listToHtml("Requires", dependencies())
- << listToHtml("Required for", supports())
- << listToHtml("See also", relations());
+ << listToHtml("Requires", dependencies())
+ << listToHtml("Required for", supports())
+ << listToHtml("See also", relations());
return linkify(str);
}
@@ -215,7 +215,7 @@
d->enabled = on;
foreach (Feature *f, supports())
- f->updateSelectable();
+ f->updateSelectable();
emit changed();
}
diff -Nru qttools-opensource-src-5.2.1/src/qconfig/feature.h qttools-opensource-src-5.3.0/src/qconfig/feature.h
--- qttools-opensource-src-5.2.1/src/qconfig/feature.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qconfig/feature.h 2014-05-15 17:12:39.000000000 +0000
@@ -56,8 +56,8 @@
{
public:
FeaturePrivate(const QString &k)
- : key(k), enabled(true), selectable(true) {};
-
+ : key(k), enabled(true), selectable(true) {};
+
const QString key;
QString section;
QString title;
@@ -71,7 +71,7 @@
class Feature : public QObject
{
- Q_OBJECT
+ Q_OBJECT
public:
static Feature* getInstance(const QString &key);
@@ -86,36 +86,36 @@
void setSection(const QString §ion);
QString section() const { return d->section; }
- void setDescription(const QString &description);
+ void setDescription(const QString &description);
QString description() const { return d->description; };
void addRelation(const QString &key);
void setRelations(const QStringList &keys);
- QList relations() const;
+ QList relations() const;
void addDependency(const QString &dependency);
void setDependencies(const QStringList &dependencies);
QList dependencies() const;
- QList supports() const;
+ QList supports() const;
QString getDocumentation() const;
void setEnabled(bool on);
bool enabled() const { return d->enabled; };
bool selectable() const { return d->selectable; }
-
- QString toHtml() const;
-
- ~Feature();
+
+ QString toHtml() const;
+
+ ~Feature();
signals:
void changed();
-
+
private:
Feature(const QString &key);
void updateSelectable();
-
+
static QMap instances;
FeaturePrivate *d;
};
diff -Nru qttools-opensource-src-5.2.1/src/qconfig/featuretreemodel.cpp qttools-opensource-src-5.3.0/src/qconfig/featuretreemodel.cpp
--- qttools-opensource-src-5.2.1/src/qconfig/featuretreemodel.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qconfig/featuretreemodel.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -71,11 +71,11 @@
Node* Node::find(const Feature *f) const
{
if (this->feature == f)
- return const_cast(this);
+ return const_cast(this);
foreach (Node *n, children)
- if (Node *m = n->find(f))
- return m;
+ if (Node *m = n->find(f))
+ return m;
return 0;
}
@@ -95,8 +95,8 @@
Feature *f = const_cast(n->feature);
if (feature->supports().contains(f)) {
children.append(n);
- qSort(children.begin(), children.end(), nodePtrLessThan);
- n->parent = this;
+ qSort(children.begin(), children.end(), nodePtrLessThan);
+ n->parent = this;
return true;
}
foreach (Node *child, children)
@@ -118,8 +118,8 @@
FeatureTreeModel::~FeatureTreeModel()
{
foreach (QString section, sections.keys())
- while (!sections[section].isEmpty())
- delete sections[section].takeFirst();
+ while (!sections[section].isEmpty())
+ delete sections[section].takeFirst();
}
/*
@@ -155,14 +155,14 @@
// try insert any toplevel nodes as child of this one
foreach (Node *n, sections[section])
- if (node->insert(n))
- sections[section].removeAll(n);
+ if (node->insert(n))
+ sections[section].removeAll(n);
// try insert this node as a child of any existing node
foreach (Node *n, sections[section])
- if (n->insert(node)) {
+ if (n->insert(node)) {
emit layoutChanged();
- return;
+ return;
}
// not a child, insert as a toplevel node
@@ -172,13 +172,13 @@
}
QModelIndex FeatureTreeModel::createIndex(int row, int column,
- const QModelIndex &parent,
- const Node *node) const
+ const QModelIndex &parent,
+ const Node *node) const
{
QModelIndex index = QAbstractItemModel::createIndex(row, column,
- (void*)node);
+ (void*)node);
if (parent.isValid())
- parentMap[index] = parent;
+ parentMap[index] = parent;
if (node)
featureIndexMap[node->feature] = index;
return index;
@@ -190,25 +190,25 @@
if (!parent.isValid()) { // index is a section
if (row < sections.size() && column == 0)
return QAbstractItemModel::createIndex(row, column);
- return QModelIndex();
+ return QModelIndex();
}
if (isSection(parent)) { // index is a toplevel feature
const int parentRow = parent.row();
if (parentRow < sections.size()) {
QString section = sections.keys().at(parentRow);
- QList nodes = sections[section];
+ QList nodes = sections[section];
if (row < nodes.size() && column < 2)
return createIndex(row, column, parent, nodes.at(row));
}
- return QModelIndex();
+ return QModelIndex();
}
// parent is a feature
Node *parentNode = static_cast(parent.internalPointer());
QList children = parentNode->children;
if (row < children.size() && column < 2)
- return createIndex(row, column, parent, children.at(row));
+ return createIndex(row, column, parent, children.at(row));
return QModelIndex();
}
@@ -247,7 +247,7 @@
return QModelIndex();
if (parentMap.contains(index))
- return parentMap.value(index);
+ return parentMap.value(index);
return QModelIndex();
}
@@ -257,8 +257,8 @@
return sections.size();
if (isSection(parent)) {
- const QString section = sections.keys().at(parent.row());
- return sections[section].size();
+ const QString section = sections.keys().at(parent.row());
+ return sections[section].size();
}
const Node *node = static_cast(parent.internalPointer());
@@ -286,36 +286,36 @@
const Node *node = static_cast(index.internalPointer());
switch (role) {
- case Qt::DisplayRole: {
- if (node == 0) // index is a section
- return sections.keys().at(index.row());
- if (index.column() == 0)
- return node->feature->key();
- Q_ASSERT(index.column() == 1);
- return node->feature->title();
- }
- case Qt::CheckStateRole: {
- if (node && index.column() == 0)
- return (node->feature->enabled() ?
- Qt::Checked : Qt::Unchecked);
- break;
- }
- case Qt::TextColorRole: {
- if (node && index.column() == 0) // feature key
- if (node->feature->selectable())
- return QApplication::palette().color(QPalette::Link);
- break;
- }
- case Qt::TextAlignmentRole:
- case Qt::BackgroundColorRole:
- case Qt::FontRole:
- case Qt::ToolTipRole: // TODO
- case Qt::StatusTipRole: // TODO
- case Qt::WhatsThisRole: // TODO
- case Qt::DecorationRole:
- case Qt::EditRole:
- default:
- break;
+ case Qt::DisplayRole: {
+ if (node == 0) // index is a section
+ return sections.keys().at(index.row());
+ if (index.column() == 0)
+ return node->feature->key();
+ Q_ASSERT(index.column() == 1);
+ return node->feature->title();
+ }
+ case Qt::CheckStateRole: {
+ if (node && index.column() == 0)
+ return (node->feature->enabled() ?
+ Qt::Checked : Qt::Unchecked);
+ break;
+ }
+ case Qt::TextColorRole: {
+ if (node && index.column() == 0) // feature key
+ if (node->feature->selectable())
+ return QApplication::palette().color(QPalette::Link);
+ break;
+ }
+ case Qt::TextAlignmentRole:
+ case Qt::BackgroundColorRole:
+ case Qt::FontRole:
+ case Qt::ToolTipRole: // TODO
+ case Qt::StatusTipRole: // TODO
+ case Qt::WhatsThisRole: // TODO
+ case Qt::DecorationRole:
+ case Qt::EditRole:
+ default:
+ break;
}
return QVariant();
}
@@ -345,20 +345,20 @@
Qt::ItemFlags FeatureTreeModel::flags(const QModelIndex &index) const
{
if (!index.isValid() || index.internalPointer() == 0)
- return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
+ return Qt::ItemIsEnabled | Qt::ItemIsSelectable;
const Node *node = static_cast(index.internalPointer());
const Feature *feature = node->feature;
Qt::ItemFlags flags = Qt::ItemIsUserCheckable | Qt::ItemIsSelectable;
if (feature->selectable())
- flags |= Qt::ItemIsEnabled;
+ flags |= Qt::ItemIsEnabled;
return flags;
}
QVariant FeatureTreeModel::headerData(int section, Qt::Orientation orientation,
- int role) const
+ int role) const
{
if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
if (section == 0)
@@ -373,9 +373,9 @@
Feature* FeatureTreeModel::getFeature(const QModelIndex &index) const
{
if (!index.isValid())
- return 0;
+ return 0;
if (isSection(index))
- return 0;
+ return 0;
Node *node = static_cast(index.internalPointer());
return const_cast(node->feature);
}
@@ -396,7 +396,7 @@
static QRegExp regexp("\\s*#\\s*define\\s+QT_NO_(\\S+)\\s*");
while (!stream.atEnd()) {
- QString line = stream.readLine();
+ QString line = stream.readLine();
if (regexp.exactMatch(line)) {
Feature *f = Feature::getInstance(regexp.cap(1));
f->setEnabled(false);
diff -Nru qttools-opensource-src-5.2.1/src/qconfig/featuretreemodel.h qttools-opensource-src-5.3.0/src/qconfig/featuretreemodel.h
--- qttools-opensource-src-5.2.1/src/qconfig/featuretreemodel.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qconfig/featuretreemodel.h 2014-05-15 17:12:39.000000000 +0000
@@ -63,7 +63,7 @@
~FeatureTreeModel();
void clear();
-
+
QVariant data(const QModelIndex &index, int role) const;
bool setData(const QModelIndex &index, const QVariant &value, int role);
Qt::ItemFlags flags(const QModelIndex &index) const;
@@ -71,32 +71,32 @@
int role = Qt::DisplayRole) const;
QModelIndex index(int row, int column,
const QModelIndex &parent = QModelIndex()) const;
- QModelIndex index(const Feature *feature) const;
+ QModelIndex index(const Feature *feature) const;
QModelIndex parent(const QModelIndex &index) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
- void addFeature(Feature *feature);
+ void addFeature(Feature *feature);
Feature* getFeature(const QModelIndex &index) const;
void readConfig(QTextStream &stream);
void writeConfig(QTextStream &stream) const;
-
+
public slots:
void featureChanged();
-
+
private:
QModelIndex createIndex(int row, int column,
const QModelIndex &parent,
- const Node *feature) const;
+ const Node *feature) const;
QModelIndex index(const QModelIndex &parent, const Feature *feature) const;
bool contains(const QString §ion, const Feature *f) const;
Node* find(const QString §ion, const Feature *f) const;
- QStringList findDisabled(const QModelIndex &parent) const;
-
+ QStringList findDisabled(const QModelIndex &parent) const;
+
QMap > sections;
mutable QHash parentMap;
- mutable QHash featureIndexMap;
+ mutable QHash featureIndexMap;
};
QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/qconfig/main.cpp qttools-opensource-src-5.3.0/src/qconfig/main.cpp
--- qttools-opensource-src-5.2.1/src/qconfig/main.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qconfig/main.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -188,7 +188,7 @@
connect(textBrowser, SIGNAL(featureClicked(QString)),
this, SLOT(showInfo(QString)));
connect(featureTree, SIGNAL(activated(QModelIndex)),
- this, SLOT(showInfo(QModelIndex)));
+ this, SLOT(showInfo(QModelIndex)));
connect(featureModel, SIGNAL(dataChanged(QModelIndex,QModelIndex)),
this, SLOT(modelChanged()));
connect(featureTree, SIGNAL(clicked(QModelIndex)),
@@ -385,9 +385,9 @@
QFile file(configFile);
if (!file.open(QIODevice::WriteOnly)) {
- QMessageBox::warning(this,"Warning",
+ QMessageBox::warning(this,"Warning",
"Cannot write to file " + configFile);
- return;
+ return;
}
QTextStream stream(&file);
@@ -403,12 +403,12 @@
void Main::loadConfig(const QString &filename)
{
if (!QFileInfo(filename).isFile())
- return;
+ return;
QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) {
- QMessageBox::warning(this,"Warning", "Cannot open file " + filename);
- return;
+ QMessageBox::warning(this,"Warning", "Cannot open file " + filename);
+ return;
}
QTextStream stream(&file);
@@ -428,8 +428,8 @@
QFile file(filename);
if (!file.open(QIODevice::ReadOnly)) {
- QMessageBox::warning(this,"Warning", "Cannot open file " + filename);
- return;
+ QMessageBox::warning(this,"Warning", "Cannot open file " + filename);
+ return;
}
Feature *feature = 0;
@@ -437,43 +437,43 @@
updateStatus(numFeatures);
QTextStream s(&file);
for (QString line = s.readLine(); !s.atEnd(); line = s.readLine()) {
- line = line.simplified();
- if (line.isEmpty())
- continue;
- if (line.startsWith('#'))
- continue;
+ line = line.simplified();
+ if (line.isEmpty())
+ continue;
+ if (line.startsWith('#'))
+ continue;
- int colon = line.indexOf(':');
- if (colon < 0) { // assume description
+ int colon = line.indexOf(':');
+ if (colon < 0) { // assume description
QString description = feature->description().simplified();
description += " " + line;
feature->setDescription(description);
- continue;
- }
+ continue;
+ }
- QString tag = line.left(colon);
- QString value = line.mid(colon+1).simplified();
- if (tag == "Feature") {
+ QString tag = line.left(colon);
+ QString value = line.mid(colon+1).simplified();
+ if (tag == "Feature") {
if (feature)
featureModel->addFeature(feature);
feature = Feature::getInstance(value);
updateStatus(++numFeatures);
- } else if (tag == "Requires") {
+ } else if (tag == "Requires") {
Q_ASSERT(feature);
feature->setDependencies(value.split(' ', QString::SkipEmptyParts));
- } else if (tag == "Name") {
- Q_ASSERT(feature);
+ } else if (tag == "Name") {
+ Q_ASSERT(feature);
feature->setTitle(value);
- } else if (tag == "Section") {
- Q_ASSERT(feature);
+ } else if (tag == "Section") {
+ Q_ASSERT(feature);
feature->setSection(value);
- } else if (tag == "SeeAlso") {
- Q_ASSERT(feature);
+ } else if (tag == "SeeAlso") {
+ Q_ASSERT(feature);
feature->setRelations(value.split(' ', QString::SkipEmptyParts));
} else if (tag == "Description") {
Q_ASSERT(feature);
feature->setDescription(value);
- }
+ }
}
if (feature)
featureModel->addFeature(feature);
@@ -492,7 +492,7 @@
model = static_cast(featureTree->model());
if (const Feature *feature = model->getFeature(index))
- textBrowser->setHtml(feature->toHtml());
+ textBrowser->setHtml(feature->toHtml());
// Ensure index is visible
QModelIndex parent = model->parent(index);
@@ -544,10 +544,10 @@
+ "/src/corelib/global";
for (int i = 1; i < argc; ++i) {
- QString arg = argv[i];
- if (arg == "-f" && i+1 < argc)
+ QString arg = argv[i];
+ if (arg == "-f" && i+1 < argc)
m.loadFeatures(argv[++i]);
- else if (arg == "-c" && i+1 < argc)
+ else if (arg == "-c" && i+1 < argc)
m.loadConfig(argv[++i]);
}
m.resize(m.sizeHint() + QSize(500,300));
diff -Nru qttools-opensource-src-5.2.1/src/qconfig/qconfig.pro qttools-opensource-src-5.3.0/src/qconfig/qconfig.pro
--- qttools-opensource-src-5.2.1/src/qconfig/qconfig.pro 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qconfig/qconfig.pro 2014-05-15 17:12:39.000000000 +0000
@@ -1,6 +1,6 @@
QT += widgets
-HEADERS = feature.h featuretreemodel.h graphics.h
-SOURCES = main.cpp feature.cpp featuretreemodel.cpp
+HEADERS = feature.h featuretreemodel.h graphics.h
+SOURCES = main.cpp feature.cpp featuretreemodel.cpp
load(qt_app)
diff -Nru qttools-opensource-src-5.2.1/src/qtconcurrent/codegenerator/example/main.cpp qttools-opensource-src-5.3.0/src/qtconcurrent/codegenerator/example/main.cpp
--- qttools-opensource-src-5.2.1/src/qtconcurrent/codegenerator/example/main.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtconcurrent/codegenerator/example/main.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -47,23 +47,23 @@
// The code generator works on items. Each item has a generate() function:
Item item("");
qDebug() << item.generate(); // produces "".
-
+
// There are several Item subclasses. Text items contains a text string which they
// reproduce when generate is called:
Text text(" Hi there");
qDebug() << text.generate(); // produces " Hi there".
-
+
// Items can be concatenated:
Item sentence = text + Text(" Bye there") ;
qDebug() << sentence.generate(); // produces "Hi there Bye there".
- // (Internally, this creates a tree of items, and generate is called recursively
+ // (Internally, this creates a tree of items, and generate is called recursively
// for items that have children.)
// Repeater items repeat their content when generate is called:
Repeater repeater = text;
repeater.setRepeatCount(3);
qDebug() << repeater.generate(); // produces "Hi there Hi there Hi there".
-
+
// Counters evaluate to the current repeat index.
Repeater repeater2 = text + Counter();
repeater2.setRepeatCount(3);
diff -Nru qttools-opensource-src-5.2.1/src/qtconcurrent/codegenerator/src/codegenerator.cpp qttools-opensource-src-5.3.0/src/qtconcurrent/codegenerator/src/codegenerator.cpp
--- qttools-opensource-src-5.2.1/src/qtconcurrent/codegenerator/src/codegenerator.cpp 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtconcurrent/codegenerator/src/codegenerator.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -81,7 +81,7 @@
GroupGenerator const * const group = static_cast(generator);
return group->currentRepeat;
} break;
-*/
+*/
default:
break;
}
@@ -90,7 +90,7 @@
}
QByteArray RepeaterGenerator::generate(GeneratorStack * const stack)
-{
+{
GeneratorStacker stacker(stack, this);
QByteArray generated;
for (int i = repeatOffset; i < repeatCount + repeatOffset; ++i) {
@@ -101,7 +101,7 @@
};
QByteArray GroupGenerator::generate(GeneratorStack * const stack)
-{
+{
const int repeatCount = currentCount(stack);
GeneratorStacker stacker(stack, this);
QByteArray generated;
@@ -134,7 +134,7 @@
const Compound operator+(const char * const text, const Item &b)
{
- return Compound(Text(text), b);
+ return Compound(Text(text), b);
}
}
\ No newline at end of file
diff -Nru qttools-opensource-src-5.2.1/src/qtconcurrent/codegenerator/src/codegenerator.h qttools-opensource-src-5.3.0/src/qtconcurrent/codegenerator/src/codegenerator.h
--- qttools-opensource-src-5.2.1/src/qtconcurrent/codegenerator/src/codegenerator.h 2014-02-01 20:37:58.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtconcurrent/codegenerator/src/codegenerator.h 2014-05-15 17:12:40.000000000 +0000
@@ -51,7 +51,7 @@
enum GeneratorType {NoopType, CompoundType, TextType, RepeaterType, CounterType, GroupType};
class BaseGenerator;
typedef QStack GeneratorStack;
-
+
template
class Stacker {
public:
@@ -61,7 +61,7 @@
QStack *stack;
};
typedef Stacker GeneratorStacker;
-
+
class BaseGenerator
{
public:
@@ -70,7 +70,7 @@
virtual QByteArray generate(GeneratorStack *stack) { Q_UNUSED(stack); return QByteArray(); };
int currentCount(GeneratorStack *stack) const;
int repeatCount(GeneratorStack *stack) const;
- GeneratorType type;
+ GeneratorType type;
};
class Item
@@ -84,34 +84,34 @@
// QExplicitlySharedDataPointer generator;
BaseGenerator * const generator;
};
-
+
class CompoundGenerator : public BaseGenerator
{
public:
- CompoundGenerator(BaseGenerator * const a, BaseGenerator * const b)
+ CompoundGenerator(BaseGenerator * const a, BaseGenerator * const b)
: BaseGenerator(CompoundType), a(a), b(b) {}
virtual QByteArray generate(GeneratorStack *stack)
{ return a->generate(stack) + b->generate(stack); };
- protected:
+ protected:
BaseGenerator * const a;
BaseGenerator * const b;
};
-
+
class Compound : public Item
{
public:
Compound(const Item &a, const Item &b) : Item(new CompoundGenerator(a.generator, b.generator)) {}
};
-
+
class TextGenerator : public BaseGenerator
{
public:
TextGenerator(const QByteArray &text) : BaseGenerator(TextType), text(text) {}
virtual QByteArray generate(GeneratorStack *) { return text; };
- protected:
+ protected:
QByteArray text;
};
-
+
class Text : public Item {
public:
Text(const QByteArray &text) : Item(new TextGenerator(text)) {}
@@ -121,7 +121,7 @@
class RepeaterGenerator : public BaseGenerator
{
public:
- RepeaterGenerator(BaseGenerator * const childGenerator)
+ RepeaterGenerator(BaseGenerator * const childGenerator)
: BaseGenerator(RepeaterType), repeatCount(1), repeatOffset(0), childGenerator(childGenerator) {}
virtual QByteArray generate(GeneratorStack *stack);
@@ -130,22 +130,22 @@
int currentRepeat;
BaseGenerator * const childGenerator;
};
-
+
class Repeater : public Item {
public:
Repeater(const Item &item) : Item(new RepeaterGenerator(item.generator)) {}
- void setRepeatCount(int count)
+ void setRepeatCount(int count)
{ static_cast(generator)->repeatCount = count; }
void setRepeatOffset(int offset)
{ static_cast(generator)->repeatOffset = offset; }
};
-
+
class CounterGenerator : public BaseGenerator
{
public:
CounterGenerator() : BaseGenerator(CounterType), offset(0), increment(1), reverse(false) {}
QByteArray generate(GeneratorStack *stack)
- {
+ {
if (reverse)
return QByteArray::number(repeatCount(stack) - (currentCount(stack) * increment) + offset + 1);
else
@@ -155,7 +155,7 @@
int increment;
bool reverse;
};
-
+
class Counter : public Item {
public:
Counter() : Item(new CounterGenerator()) {}
@@ -168,12 +168,12 @@
{ static_cast(generator)->reverse = reverse; }
};
-
+
class GroupGenerator : public BaseGenerator
{
public:
GroupGenerator(BaseGenerator * const childGenerator)
- : BaseGenerator(GroupType), currentRepeat(0), childGenerator(childGenerator),
+ : BaseGenerator(GroupType), currentRepeat(0), childGenerator(childGenerator),
separator(new BaseGenerator()), prefix(new BaseGenerator()), postfix(new BaseGenerator()) { }
virtual QByteArray generate(GeneratorStack *stack);
int currentRepeat;
@@ -182,20 +182,20 @@
BaseGenerator *prefix;
BaseGenerator *postfix;
};
-
+
class Group : public Item
{
public:
Group(const Item &item) : Item(new GroupGenerator(item.generator)) { setSeparator(", "); }
- void setSeparator(const Item &separator)
+ void setSeparator(const Item &separator)
{ static_cast(generator)->separator = separator.generator; }
- void setPrefix(const Item &prefix)
+ void setPrefix(const Item &prefix)
{ static_cast(generator)->prefix = prefix.generator; }
- void setPostfix(const Item &postfix)
+ void setPostfix(const Item &postfix)
{ static_cast(generator)->postfix = postfix.generator; }
};
- const Compound operator+(const Item &a, const Item &b);
+ const Compound operator+(const Item &a, const Item &b);
const Compound operator+(const Item &a, const char * const text);
const Compound operator+(const char * const text, const Item &b);
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/appxhandler.cpp qttools-opensource-src-5.3.0/src/qtd3dservice/appxhandler.cpp
--- qttools-opensource-src-5.2.1/src/qtd3dservice/appxhandler.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/appxhandler.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,341 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "d3dservice.h"
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+using namespace Microsoft::WRL;
+using namespace Microsoft::WRL::Wrappers;
+using namespace ABI::Windows::Management::Deployment;
+using namespace ABI::Windows::ApplicationModel;
+using namespace ABI::Windows::Storage;
+using namespace ABI::Windows::Foundation::Collections;
+
+struct ComInitializer
+{
+ ComInitializer()
+ {
+ m_hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED);
+ if (FAILED(m_hr))
+ qCWarning(lcD3DService) << "Unable to initialize COM.";
+ }
+ ~ComInitializer()
+ {
+ if (isValid())
+ CoUninitialize();
+ }
+ bool isValid() const
+ {
+ return SUCCEEDED(m_hr);
+ }
+private:
+ HRESULT m_hr;
+};
+
+extern int appxAppNames(int deviceIndex, QSet &apps)
+{
+ if (deviceIndex) {
+ qCWarning(lcD3DService) << "Unsupported device index:" << deviceIndex;
+ return 1;
+ }
+
+ ComInitializer com;
+ if (!com.isValid())
+ return 1;
+
+ ComPtr packageManager;
+ HRESULT hr = RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Management_Deployment_PackageManager).Get(),
+ &packageManager);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to instantiate package manager:"
+ << qt_error_string(hr);
+ return 1;
+ }
+
+ ComPtr> packageCollection;
+ hr = packageManager->FindPackagesByUserSecurityId(NULL, &packageCollection);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Failed to find Appx packages:"
+ << qt_error_string(hr);
+ return 1;
+ }
+ ComPtr> iterator;
+ hr = packageCollection->First(&iterator);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Failed to get package iterator:"
+ << qt_error_string(hr);
+ return 1;
+ }
+ boolean hasCurrent;
+ hr = iterator->get_HasCurrent(&hasCurrent);
+ while (SUCCEEDED(hr) && hasCurrent) {
+ ComPtr package;
+ hr = iterator->get_Current(&package);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << qt_error_string(hr);
+ return 1;
+ }
+
+#if _MSC_VER >= 1800
+ ComPtr package2;
+ hr = package.As(&package2);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << qt_error_string(hr);
+ return 1;
+ }
+
+ boolean isDevelopmentMode;
+ hr = package2->get_IsDevelopmentMode(&isDevelopmentMode);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << qt_error_string(hr);
+ return 1;
+ }
+ if (!isDevelopmentMode) {
+ hr = iterator->MoveNext(&hasCurrent);
+ continue;
+ }
+#endif // _MSC_VER >= 1800
+
+ ComPtr id;
+ hr = package->get_Id(&id);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << qt_error_string(hr);
+ return 1;
+ }
+
+ HString fullName;
+ hr = id->get_FullName(fullName.GetAddressOf());
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << qt_error_string(hr);
+ return 1;
+ }
+ apps.insert(QString::fromWCharArray(fullName.GetRawBuffer(NULL)));
+ hr = iterator->MoveNext(&hasCurrent);
+ }
+ return 0;
+}
+
+/* This function handles a worker thread servicing an Appx application */
+extern int handleAppxDevice(int deviceIndex, const QString &app, const QString &localBase, HANDLE runLock)
+{
+ if (deviceIndex) {
+ qCWarning(lcD3DService) << "Unsupported device index:" << deviceIndex;
+ return 1;
+ }
+
+ ComInitializer com;
+ if (!com.isValid())
+ return 1;
+
+ ComPtr packageManager;
+ HRESULT hr = RoActivateInstance(HString::MakeReference(RuntimeClass_Windows_Management_Deployment_PackageManager).Get(),
+ &packageManager);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to instantiate package manager:" << qt_error_string(hr);
+ return 1;
+ }
+
+ HStringReference packageFullName(reinterpret_cast(app.utf16()));
+ ComPtr package;
+ hr = packageManager->FindPackageByUserSecurityIdPackageFullName(NULL, packageFullName.Get(), &package);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to query package:" << qt_error_string(hr);
+ return 1;
+ }
+ if (!package) {
+ qCWarning(lcD3DService) << "Package is not installed.";
+ return 1;
+ }
+ ComPtr packageId;
+ hr = package->get_Id(&packageId);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to get package ID:" << qt_error_string(hr);
+ return 1;
+ }
+ HString packageFamilyName;
+ hr = packageId->get_FamilyName(packageFamilyName.GetAddressOf());
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to get package name:" << qt_error_string(hr);
+ return 1;
+ }
+
+ const QString localSourcePath = localBase + QStringLiteral("\\source\\");
+ const QString localBinaryPath = localBase + QStringLiteral("\\binary\\");
+
+ const QString remoteBase =
+ QDir::toNativeSeparators(QStandardPaths::writableLocation(QStandardPaths::DataLocation))
+ + QStringLiteral("\\Packages\\")
+ + QString::fromWCharArray(packageFamilyName.GetRawBuffer(NULL))
+ + QStringLiteral("\\LocalState\\d3dcompiler");
+ const QString remoteSourcePath = remoteBase + QStringLiteral("\\source\\");
+ const QString remoteBinaryPath = remoteBase + QStringLiteral("\\binary\\");
+
+ bool checkDirectories = true;
+ forever {
+ // If the run lock is signaled, it's time to quit
+ if (WaitForSingleObject(runLock, 0) == WAIT_OBJECT_0)
+ return 0;
+
+ // Run certain setup steps once per connection
+ if (checkDirectories) {
+ // Check remote directory
+ QDir dir(remoteBase);
+ if (!dir.exists()) {
+ dir.cdUp();
+ if (!dir.mkpath(QStringLiteral("d3dcompiler"))) {
+ qCWarning(lcD3DService) << "Could not create d3dcompiler directory.";
+ Sleep(1000);
+ continue;
+ }
+ dir.cd(QStringLiteral("d3dcompiler"));
+ }
+
+ if (!QFile::exists(remoteSourcePath)) {
+ if (!dir.mkpath(QStringLiteral("source"))) {
+ qCWarning(lcD3DService) << "Could not create source directory.";
+ Sleep(1000);
+ continue;
+ }
+ }
+
+ if (!QFile::exists(remoteBinaryPath)) {
+ if (!dir.mkpath(QStringLiteral("binary"))) {
+ qCWarning(lcD3DService) << "Could not create binary directory.";
+ Sleep(1000);
+ continue;
+ }
+ }
+
+ checkDirectories = false;
+ }
+
+ // Ok, ready to check for shaders
+ QDirIterator it(remoteSourcePath);
+ while (it.hasNext()) {
+ const QString remoteSource = it.next();
+ if (!it.fileInfo().isFile())
+ continue;
+ const QString shaderFileName = it.fileName();
+ const QString localSource = localSourcePath + shaderFileName;
+ const QString localBinary = localBinaryPath + shaderFileName;
+
+ // Copy remote source to local
+ if (QFile::exists(localSource))
+ QFile::remove(localSource);
+ QFile remoteSourceFile(remoteSource);
+ if (!remoteSourceFile.copy(localSource)) {
+ qCWarning(lcD3DService) << "Unable to copy shader source:" << remoteSource;
+ qCWarning(lcD3DService) << remoteSourceFile.errorString();
+ continue;
+ }
+
+ // Remove the remote file
+ if (!remoteSourceFile.remove()) {
+ qCWarning(lcD3DService) << "Unable to remove shader source:" << remoteSource;
+ qCWarning(lcD3DService) << remoteSourceFile.errorString();
+ continue;
+ }
+
+ // Compile shader
+ hr = D3DService::compileShader(localSource, localBinary);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to compile shader:" << localSource;
+ qCWarning(lcD3DService) << qt_error_string(hr);
+ continue;
+ }
+
+ // All went well, copy the blob to the device
+ const QString remoteBinary = remoteBinaryPath + shaderFileName;
+ if (QFile::exists(remoteBinary))
+ QFile::remove(remoteBinary);
+ QFile localBinaryFile(localBinary);
+ if (!localBinaryFile.copy(remoteBinary)) {
+ qCWarning(lcD3DService) << "Unable to copy to remote: " << localBinary;
+ qCWarning(lcD3DService) << localBinaryFile.errorString();
+ continue;
+ }
+
+ qCDebug(lcD3DService) << "Compiled local shader to:" << localBinary
+ << "and uploaded to:" << remoteBinary;
+ }
+
+ HANDLE notification = FindFirstChangeNotification(
+ reinterpret_cast(remoteSourcePath.utf16()),
+ FALSE, FILE_NOTIFY_CHANGE_FILE_NAME);
+ if (!notification) {
+ qCCritical(lcD3DService) << "Failed to set up shader directory notification:"
+ << qt_error_string(GetLastError());
+ return 1;
+ }
+
+ // Sleep for up to 30 seconds; wake if a new shader appears
+ HANDLE waitHandles[] = { notification, runLock };
+ DWORD event = WaitForMultipleObjects(2, waitHandles, FALSE, 30000);
+ FindCloseChangeNotification(notification);
+ // Timeout or directory change; loop and update
+ if (event == WAIT_TIMEOUT || event == WAIT_OBJECT_0)
+ continue;
+ // runLock set; exit
+ if (event == WAIT_OBJECT_0 + 1)
+ return 0;
+
+ hr = GetLastError();
+ // If the app was uninstalled, this is expected
+ if (hr == ERROR_INVALID_HANDLE) {
+ qCDebug(lcD3DService) << "The wait handle was invalidated; worker exiting.";
+ return 1;
+ }
+
+ qCWarning(lcD3DService) << "Appx handler wait failed:"
+ << qt_error_string(hr);
+ return 1;
+ }
+}
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/compilation.cpp qttools-opensource-src-5.3.0/src/qtd3dservice/compilation.cpp
--- qttools-opensource-src-5.2.1/src/qtd3dservice/compilation.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/compilation.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,104 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "d3dservice.h"
+
+#include
+#include
+
+#include
+#include
+using namespace Microsoft::WRL;
+
+typedef HRESULT (WINAPI *D3DCompileFunc)(
+ const void *, SIZE_T, const char *, const D3D_SHADER_MACRO *, ID3DInclude *,
+ const char *, const char *, UINT, UINT, ID3DBlob **, ID3DBlob **);
+
+HRESULT D3DService::compileShader(const QString &source, const QString &destination)
+{
+ static D3DCompileFunc D3DCompile = 0;
+ if (!D3DCompile) {
+ HMODULE d3dcompiler = LoadLibrary(L"d3dcompiler_47");
+ if (!d3dcompiler)
+ return GetLastError();
+
+ D3DCompile = reinterpret_cast(GetProcAddress(d3dcompiler, "D3DCompile"));
+ if (!D3DCompile)
+ return GetLastError();
+ }
+
+ QFile sourceFile(source);
+ qCDebug(lcD3DService) << "Shader source observed at:" << source;
+ if (!sourceFile.open(QFile::ReadOnly)) {
+ qCWarning(lcD3DService) << "Unable to open shader source:" << sourceFile.errorString();
+ return E_FAIL;
+ }
+
+ const QByteArray data = sourceFile.readAll();
+
+ QStringList parts = source.split(QLatin1Char('!'));
+ if (parts.size() < 4) {
+ qCWarning(lcD3DService) << "The shader source file is missing meta data.";
+ return E_FAIL;
+ }
+
+ ComPtr blob, errorMessage;
+ HRESULT hr = D3DCompile(data, data.size(), parts.at(0).toUtf8(), 0, 0, parts.at(1).toUtf8(),
+ parts.at(2).toUtf8(), parts.at(3).toUInt(), 0, &blob, &errorMessage);
+ if (FAILED(hr)) {
+ if (errorMessage) {
+ const QString error = QString::fromUtf8(
+ static_cast(errorMessage->GetBufferPointer()),
+ errorMessage->GetBufferSize());
+ qCWarning(lcD3DService) << error;
+ }
+ return hr;
+ }
+
+ QFile destinationFile(destination);
+ if (!destinationFile.open(QFile::WriteOnly)) {
+ qCWarning(lcD3DService) << "Unable to open destination file:" << destinationFile.errorString();
+ return E_FAIL;
+ }
+
+ destinationFile.write((const char *)blob->GetBufferPointer(), blob->GetBufferSize());
+ return hr;
+}
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/d3dservice.cpp qttools-opensource-src-5.3.0/src/qtd3dservice/d3dservice.cpp
--- qttools-opensource-src-5.2.1/src/qtd3dservice/d3dservice.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/d3dservice.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,564 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "d3dservice.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+QT_USE_NAMESPACE
+
+Q_LOGGING_CATEGORY(lcD3DService, "qt.d3dservice")
+
+#define _WIDEN(x) L ## x
+#define WIDEN(x) _WIDEN(x)
+#define LQT_VERSION_STR WIDEN(QT_VERSION_STR)
+
+// The GUID used by the Windows Phone IP over USB service
+static const GUID GUID_DEVICE_WINPHONE8_USB = { 0x26fedc4eL, 0x6ac3, 0x4241, 0x9e, 0x4d, 0xe3, 0xd4, 0xb2, 0xc5, 0xc5, 0x34 };
+
+// Handlers
+typedef int (*HandleDeviceFunction)(int, const QString &, const QString &, HANDLE);
+extern int handleAppxDevice(int deviceIndex, const QString &app, const QString &cacheDir, HANDLE runLock);
+extern int handleXapDevice(int deviceIndex, const QString &app, const QString &cacheDir, HANDLE runLock);
+typedef int (*AppListFunction)(int, QSet &);
+extern int xapAppNames(int deviceIndex, QSet &apps);
+extern int appxAppNames(int deviceIndex, QSet &app);
+
+extern QStringList xapDeviceNames();
+
+// Callbacks
+static BOOL __stdcall control(DWORD type);
+static LRESULT __stdcall control(HWND window, UINT msg, WPARAM wParam, LPARAM lParam);
+static DWORD __stdcall deviceWorker(LPVOID param);
+static DWORD __stdcall appWorker(LPVOID param);
+
+union ErrorId
+{
+ enum FacilityFlag {
+ Success = 0x0,
+ Informational = 0x40000000,
+ Warning = 0x80000000,
+ Error = Informational|Warning,
+ Customer = 0x20000000
+ };
+ struct {
+ ushort facility;
+ ushort code;
+ };
+ ulong val;
+};
+
+enum ControlEvent
+{
+ NoCommand = 0, Stop = 1, NewWorker = 2, PhoneConnected = 3
+};
+
+struct D3DServicePrivate
+{
+ D3DServicePrivate()
+ : controlEvent(CreateEvent(NULL, FALSE, FALSE, NULL))
+ , controlWindow(0)
+ , deviceHandle(0)
+ {
+ }
+ ~D3DServicePrivate()
+ {
+ if (deviceHandle)
+ UnregisterDeviceNotification(deviceHandle);
+ if (controlWindow)
+ CloseHandle(controlWindow);
+ if (controlEvent)
+ CloseHandle(controlEvent);
+ }
+
+ HANDLE controlEvent;
+ HWND controlWindow;
+ HDEVNOTIFY deviceHandle;
+ QList eventQueue;
+ QList workerQueue;
+};
+Q_GLOBAL_STATIC(D3DServicePrivate, d)
+
+struct WorkerParam
+{
+ enum { NoError = 0, GeneralError = 1, BadDeviceIndex = 2, NoCacheDir = 3 };
+ WorkerParam(const QString &deviceName, const QString &app, HANDLE runLock)
+ : deviceName(deviceName), app(app), runLock(runLock) { }
+ QString deviceName;
+ QString app;
+ HANDLE runLock;
+};
+
+class Worker
+{
+public:
+ Worker(const QStringPair &config, LPTHREAD_START_ROUTINE worker)
+ : m_runLock(CreateEvent(NULL, FALSE, FALSE, NULL))
+ , m_param(config.first, config.second, m_runLock)
+ , m_thread(CreateThread(NULL, 0, worker, &m_param, 0, NULL))
+ {
+ }
+ ~Worker()
+ {
+ SetEvent(m_runLock);
+ WaitForSingleObject(m_thread, INFINITE);
+ CloseHandle(m_runLock);
+ CloseHandle(m_thread);
+ }
+ HANDLE thread() const
+ {
+ return m_thread;
+ }
+private:
+ HANDLE m_runLock;
+ WorkerParam m_param;
+ HANDLE m_thread;
+};
+
+static QString prepareCache(const QString &device, const QString &app)
+{
+ // Make sure we have a writable cache
+ QDir baseDir(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
+ if (!baseDir.mkpath(QStringLiteral("qtd3dservice")))
+ return QString();
+ baseDir.cd(QStringLiteral("qtd3dservice"));
+ if (!baseDir.mkpath(device))
+ return QString();
+ baseDir.cd(device);
+ if (!baseDir.mkpath(app))
+ return QString();
+ baseDir.cd(app);
+ if (!baseDir.mkpath(QStringLiteral("source")))
+ return QString();
+ if (!baseDir.mkpath(QStringLiteral("binary")))
+ return QString();
+ return QDir::toNativeSeparators(baseDir.absolutePath());
+}
+
+bool D3DService::start()
+{
+ HANDLE runLock = CreateMutex(NULL, TRUE, L"Local\\qtd3dservice");
+ if (!runLock || GetLastError() == ERROR_ALREADY_EXISTS) {
+ qCWarning(lcD3DService) << "The service is already running.";
+ return false;
+ }
+
+ SetConsoleCtrlHandler(&control, TRUE);
+
+ // Create an invisible window for getting broadcast events
+ WNDCLASS controlWindowClass = { 0, &control, 0, 0, NULL, NULL,
+ NULL, NULL, NULL, L"controlWindow" };
+ if (!RegisterClass(&controlWindowClass)) {
+ qCCritical(lcD3DService) << "Unable to register control window class:"
+ << qt_error_string(GetLastError());
+ return false;
+ }
+ d->controlWindow = CreateWindowEx(0, L"controlWindow", NULL, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL);
+
+ // Register for USB notifications
+ DEV_BROADCAST_DEVICEINTERFACE filter = {
+ sizeof(DEV_BROADCAST_DEVICEINTERFACE), DBT_DEVTYP_DEVICEINTERFACE,
+ 0, GUID_DEVICE_WINPHONE8_USB, 0
+ };
+ d->deviceHandle = RegisterDeviceNotification(d->controlWindow, &filter, DEVICE_NOTIFY_WINDOW_HANDLE);
+
+ QVector waitHandles;
+ waitHandles.append(d->controlEvent);
+
+ // Dummy handle for phone (gets replaced by a worker when needed)
+ HANDLE dummyHandle;
+ DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(),
+ GetCurrentProcess(), &dummyHandle, SYNCHRONIZE, FALSE, 0);
+ waitHandles.append(dummyHandle);
+
+ // Event handles for emulators (XDE)
+ WCHAR username[MAX_PATH];
+ ULONG usernameSize = MAX_PATH;
+ GetUserName(username, &usernameSize);
+ const QStringList emulatorNames = xapDeviceNames().mid(1);
+ foreach (const QString &name, emulatorNames) {
+ const QString eventName = QStringLiteral("Local\\XdeOnServerInitialize")
+ + name + QLatin1Char('.') + QString::fromWCharArray(username, usernameSize).toLower();
+ HANDLE event = CreateEvent(NULL, TRUE, FALSE, reinterpret_cast(eventName.utf16()));
+ if (event)
+ waitHandles.append(event);
+ else
+ qCWarning(lcD3DService) << "Unable to create event:" << qt_error_string(GetLastError());
+ }
+
+ // App monitoring threads
+ QHash workers;
+ QHash workerThreads;
+
+ // Device monitoring threads - one per device
+ QVector deviceWorkers(emulatorNames.size() + 1, NULL);
+
+ // If a Windows Phone is already connected, queue a device worker
+ HDEVINFO info = SetupDiGetClassDevs(&GUID_DEVICE_WINPHONE8_USB, NULL, NULL,
+ DIGCF_DEVICEINTERFACE|DIGCF_PRESENT);
+ if (info != INVALID_HANDLE_VALUE) {
+ SP_DEVINFO_DATA infoData = { sizeof(SP_DEVINFO_DATA) };
+ if (SetupDiEnumDeviceInfo(info, 0, &infoData)) {
+ d->eventQueue.append(PhoneConnected);
+ SetEvent(d->controlEvent);
+ }
+ SetupDiDestroyDeviceInfoList(info);
+ }
+
+ // Create a monitoring thread for local Appx packages
+ Worker appxWorker(qMakePair(QStringLiteral("local"), QString()), &deviceWorker);
+ Q_UNUSED(appxWorker);
+
+ // Master loop
+ // This loop handles incoming events from the service controller and
+ // worker threads. It also creates new worker threads as needed.
+ const uint phoneEvent = WAIT_OBJECT_0 + 1;
+ const uint minEmulatorEvent = phoneEvent + 1;
+ const uint maxEmulatorEvent = minEmulatorEvent + emulatorNames.size() - 1;
+ const uint minWorker = maxEmulatorEvent + 1;
+ uint maxWorker = minWorker + workers.size() - 1;
+ forever {
+ DWORD event = MsgWaitForMultipleObjects(waitHandles.size(), waitHandles.data(), FALSE, INFINITE, QS_ALLINPUT);
+ if (event >= WAIT_OBJECT_0 && event < WAIT_OBJECT_0 + waitHandles.size()) {
+ // A control event occurred
+ if (event == WAIT_OBJECT_0) {
+ bool shutdown = false;
+ while (!d->eventQueue.isEmpty()) {
+ ControlEvent controlEvent = d->eventQueue.takeFirst();
+
+ // Break out and shutdown
+ if (controlEvent == Stop) {
+ shutdown = true;
+ break;
+ }
+
+ // A new worker is in the queue
+ if (controlEvent == NewWorker) {
+ while (!d->workerQueue.isEmpty()) {
+ const QStringPair config = d->workerQueue.takeFirst();
+ if (workers.contains(config)) { // The config is already running
+ qCDebug(lcD3DService) << "Discarded worker configuration:"
+ << config.first << config.second;
+ continue;
+ }
+
+ Worker *worker = new Worker(config, &appWorker);
+ workers.insert(config, worker);
+ workerThreads.insert(worker->thread(), config);
+ waitHandles.append(worker->thread());
+ maxWorker = minWorker + workers.size() - 1;
+ }
+ continue;
+ }
+
+ // A Windows Phone device was connected
+ if (controlEvent == PhoneConnected) {
+ qCDebug(lcD3DService) << "A Windows Phone has connected.";
+ // The worker is already active
+ if (deviceWorkers.first())
+ continue;
+
+ // Start the phone monitoring thread
+ Worker *worker = new Worker(qMakePair(QString::number(0), QString()), &deviceWorker);
+ deviceWorkers[0] = worker;
+ CloseHandle(waitHandles[phoneEvent - WAIT_OBJECT_0]);
+ waitHandles[phoneEvent - WAIT_OBJECT_0] = worker->thread();
+ continue;
+ }
+ }
+
+ if (shutdown)
+ break;
+
+ continue;
+ }
+
+ // Device events
+ if (event >= phoneEvent && event <= maxEmulatorEvent) {
+ const int deviceIndex = event - phoneEvent;
+ // Determine if the handle in the slot is an event or thread
+ if (GetThreadId(waitHandles[event - WAIT_OBJECT_0])) {
+ qCDebug(lcD3DService) << "Device worker exited:" << deviceIndex;
+ // The thread has exited, close the handle and replace the event
+ delete deviceWorkers.at(deviceIndex);
+ deviceWorkers[deviceIndex] = 0;
+
+ // The phone case is handled elsewhere; set a dummy handle
+ if (event == phoneEvent) {
+ HANDLE dummyHandle;
+ DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(),
+ GetCurrentProcess(), &dummyHandle, SYNCHRONIZE, FALSE, 0);
+ waitHandles[event - WAIT_OBJECT_0] = dummyHandle;
+ continue;
+ }
+
+ // Re-create the event handle
+ const QString eventName = QStringLiteral("Local\\XdeOnServerInitialize")
+ + emulatorNames.at(deviceIndex - 1) + QLatin1Char('.')
+ + QString::fromWCharArray(username, usernameSize).toLower();
+ HANDLE emulatorEvent = CreateEvent(
+ NULL, TRUE, FALSE, reinterpret_cast(eventName.utf16()));
+ if (emulatorEvent) {
+ waitHandles[event - WAIT_OBJECT_0] = emulatorEvent;
+ } else {
+ // If the above fails, replace it with a dummy to keep things going
+ qCCritical(lcD3DService).nospace() << "Unable to create event for emulator "
+ << emulatorNames.at(deviceIndex - 1)
+ << ": " << qt_error_string(GetLastError());
+ HANDLE dummyHandle;
+ DuplicateHandle(GetCurrentProcess(), GetCurrentProcess(),
+ GetCurrentProcess(), &dummyHandle, SYNCHRONIZE, FALSE, 0);
+ waitHandles[event - WAIT_OBJECT_0] = dummyHandle;
+ }
+ } else {
+ qCDebug(lcD3DService) << "An emulator was activated:" << deviceIndex;
+ // The event was set; close the handle and replace with a thread
+ CloseHandle(waitHandles[event - WAIT_OBJECT_0]);
+
+ // This shouldn't happen
+ if (event == phoneEvent)
+ continue;
+
+ const QStringPair config = qMakePair(QString::number(deviceIndex), QString());
+ Worker *worker = new Worker(config, &deviceWorker);
+ deviceWorkers[deviceIndex] = worker;
+ waitHandles[event - WAIT_OBJECT_0] = worker->thread();
+ }
+ continue;
+ }
+
+ // A worker exited
+ if (event >= minWorker && event <= maxWorker) {
+ // Delete the worker and clear the handle (TODO: remove it?)
+ HANDLE thread = waitHandles.takeAt(event - WAIT_OBJECT_0);
+ QStringPair config = workerThreads.take(thread);
+ Worker *worker = workers.take(config);
+ delete worker;
+ continue;
+ }
+ }
+
+ // TODO: check return val for this
+ MSG msg;
+ if (PeekMessage(&msg, d->controlWindow, 0, 0, PM_REMOVE))
+ DispatchMessage(&msg);
+ }
+
+ qDeleteAll(workers);
+
+ // Close the phone and emulator handles
+ for (int i = 0; i <= emulatorNames.size(); ++i) {
+ if (GetThreadId(waitHandles[i + 1]))
+ delete deviceWorkers.at(i);
+ else
+ CloseHandle(waitHandles[i + 1]);
+ }
+
+ CloseHandle(runLock);
+
+ return true;
+}
+
+DWORD __stdcall deviceWorker(LPVOID param)
+{
+ WorkerParam *args = reinterpret_cast(param);
+
+ // The list of applications on this device will be polled until
+ // an error code is returned (e.g. the device is disconnected) or
+ // the thread is told to exit.
+ QSet appNames;
+ AppListFunction appList;
+
+ int deviceIndex = 0;
+ HKEY waitKey = 0;
+ if (args->deviceName.isEmpty() || args->deviceName == QStringLiteral("local")) {
+ appList = appxAppNames;
+ LONG result = RegOpenKeyEx(
+ HKEY_LOCAL_MACHINE,
+ L"SOFTWARE\\Classes\\Local Settings\\Software\\Microsoft\\Windows\\CurrentVersion\\AppModel\\PackageRepository\\Packages",
+ 0, KEY_NOTIFY, &waitKey);
+ if (result != ERROR_SUCCESS) {
+ qCWarning(lcD3DService) << "Unable to open registry key for Appx discovery:"
+ << qt_error_string(result);
+ waitKey = 0;
+ }
+ } else {
+ // CoreCon (Windows Phone)
+ bool ok;
+ deviceIndex = args->deviceName.toInt(&ok);
+ if (!ok)
+ return WorkerParam::BadDeviceIndex;
+
+ appList = xapAppNames;
+ }
+
+ forever {
+ if (WaitForSingleObject(args->runLock, 0) == WAIT_OBJECT_0)
+ return 0;
+
+ QSet latestAppNames;
+ int exitCode = appList(deviceIndex, latestAppNames);
+ if (exitCode != WorkerParam::NoError)
+ return exitCode;
+
+ QSet newAppNames = latestAppNames - appNames;
+ if (!newAppNames.isEmpty()) {
+ // Create a new app watcher for each new app
+ foreach (const QString &app, newAppNames) {
+ qCWarning(lcD3DService).nospace() << "Found app " << app << " on device "
+ << args->deviceName << '.';
+ d->workerQueue.append(qMakePair(args->deviceName, app));
+ }
+
+ d->eventQueue.append(NewWorker);
+ SetEvent(d->controlEvent);
+ }
+
+ appNames = latestAppNames;
+
+ // If possible, wait for the registry event (otherwise, go straight to sleep)
+ if (waitKey) {
+ HANDLE waitEvent = CreateEvent(NULL, FALSE, FALSE, NULL);
+ LONG result = RegNotifyChangeKeyValue(waitKey, TRUE, REG_NOTIFY_CHANGE_NAME, waitEvent, TRUE);
+ if (result != ERROR_SUCCESS) {
+ qCWarning(lcD3DService) << "Unable to create registry notifier:"
+ << qt_error_string(result);
+ RegCloseKey(waitKey); // Revert to polling
+ waitKey = 0;
+ }
+
+ HANDLE waitHandles[] = { args->runLock, waitEvent };
+ result = WaitForMultipleObjects(2, waitHandles, FALSE, INFINITE);
+ CloseHandle(waitEvent);
+ if (result == WAIT_OBJECT_0) // runLock, exit
+ return 0;
+ if (result == WAIT_OBJECT_0 + 1) { // registry changed, reset app list
+ appNames.clear();
+ } else {
+ qCWarning(lcD3DService) << "Unexpected wait result:" << result
+ << qt_error_string(GetLastError());
+ RegCloseKey(waitKey); // Revert to polling
+ waitKey = 0;
+ }
+ }
+ Sleep(1000);
+ }
+
+ if (waitKey)
+ RegCloseKey(waitKey);
+ return 0;
+}
+
+DWORD __stdcall appWorker(LPVOID param)
+{
+ WorkerParam *args = reinterpret_cast(param);
+
+ HandleDeviceFunction handleDevice;
+ QString cachePath;
+ int deviceIndex = 0;
+ // Simple case, local device
+ if (args->deviceName.isEmpty() || args->deviceName == QStringLiteral("local")) {
+ cachePath = prepareCache(QStringLiteral("local"), args->app);
+ if (cachePath.isEmpty()) {
+ qCCritical(lcD3DService) << "Unable to create local shader cache.";
+ return WorkerParam::NoCacheDir;
+ }
+ handleDevice = &handleAppxDevice;
+ } else {
+ // CoreCon (Windows Phone) case
+ bool ok;
+ deviceIndex = args->deviceName.toInt(&ok);
+ if (!ok)
+ return WorkerParam::BadDeviceIndex;
+ cachePath = prepareCache(args->deviceName, args->app);
+ if (cachePath.isEmpty()) {
+ qCCritical(lcD3DService) << "Unable to create local shader cache.";
+ return WorkerParam::NoCacheDir;
+ }
+ handleDevice = &handleXapDevice;
+ }
+
+ return handleDevice(deviceIndex, args->app, cachePath, args->runLock);
+}
+
+// Console message controller
+LRESULT __stdcall control(HWND window, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ if (msg == WM_DEVICECHANGE && wParam == DBT_DEVICEARRIVAL) {
+ DEV_BROADCAST_DEVICEINTERFACE *header =
+ reinterpret_cast(lParam);
+ if (header->dbcc_classguid == GUID_DEVICE_WINPHONE8_USB) {
+ d->eventQueue.append(PhoneConnected);
+ SetEvent(d->controlEvent);
+ }
+ }
+ return DefWindowProc(window, msg, wParam, lParam);
+}
+
+// Console CTRL controller
+BOOL __stdcall control(DWORD type)
+{
+ switch (type) {
+ case CTRL_C_EVENT:
+ case CTRL_CLOSE_EVENT:
+ case CTRL_LOGOFF_EVENT:
+ case CTRL_SHUTDOWN_EVENT: {
+ d->eventQueue.append(Stop);
+ SetEvent(d->controlEvent);
+ return true;
+ }
+ // fall through
+ case CTRL_BREAK_EVENT:
+ default:
+ break;
+ }
+ return false;
+}
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/d3dservice.h qttools-opensource-src-5.3.0/src/qtd3dservice/d3dservice.h
--- qttools-opensource-src-5.2.1/src/qtd3dservice/d3dservice.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/d3dservice.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef D3DSERVICE_H
+#define D3DSERVICE_H
+
+#include
+#include
+#include
+#include
+#include
+
+QT_USE_NAMESPACE
+
+typedef QPair QStringPair;
+namespace D3DService
+{
+ HRESULT compileShader(const QString &source, const QString &destination);
+
+ bool start();
+
+ QStringList devices();
+ QStringList apps(const QString &device);
+ QStringList sources(const QString &device, const QString &app);
+ QStringList binaries(const QString &device, const QString &app);
+}
+
+Q_DECLARE_LOGGING_CATEGORY(lcD3DService)
+
+#endif // D3DSERVICE_H
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/info.cpp qttools-opensource-src-5.3.0/src/qtd3dservice/info.cpp
--- qttools-opensource-src-5.2.1/src/qtd3dservice/info.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/info.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "d3dservice.h"
+
+#include
+#include
+
+QT_USE_NAMESPACE
+
+QStringList D3DService::devices()
+{
+ const QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation)
+ + QStringLiteral("/qtd3dservice"));
+ return dir.entryList(QDir::Dirs|QDir::NoDotAndDotDot);
+}
+
+QStringList D3DService::apps(const QString &device)
+{
+ const QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation)
+ + QStringLiteral("/qtd3dservice/")
+ + (device.isEmpty() ? QStringLiteral("local") : device));
+ return dir.entryList(QDir::Dirs|QDir::NoDotAndDotDot);
+}
+
+QStringList D3DService::sources( const QString &device, const QString &app)
+{
+ const QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation)
+ + QStringLiteral("/qtd3dservice/")
+ + (device.isEmpty() ? QStringLiteral("local") : device)
+ + QLatin1Char('/') + app + QStringLiteral("/source"));
+ QStringList entries;
+ foreach (const QFileInfo &info, dir.entryInfoList(QDir::Files))
+ entries.append(info.absoluteFilePath());
+ return entries;
+}
+
+QStringList D3DService::binaries(const QString &device, const QString &app)
+{
+ const QDir dir(QStandardPaths::writableLocation(QStandardPaths::DataLocation)
+ + QStringLiteral("/qtd3dservice/")
+ + (device.isEmpty() ? QStringLiteral("local") : device)
+ + QLatin1Char('/') + app + QStringLiteral("/binary"));
+ QStringList entries;
+ foreach (const QFileInfo &info, dir.entryInfoList(QDir::Files))
+ entries.append(info.absoluteFilePath());
+ return entries;
+}
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/main.cpp qttools-opensource-src-5.3.0/src/qtd3dservice/main.cpp
--- qttools-opensource-src-5.2.1/src/qtd3dservice/main.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/main.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,242 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include "d3dservice.h"
+
+static QFile outputFile;
+static void outputFileMessageHandler(QtMsgType, const QMessageLogContext &, const QString &text)
+{
+ outputFile.write(text.toUtf8());
+ outputFile.write("\r\n");
+}
+
+static void outputList(const QStringList &files, bool useLogger)
+{
+ foreach (const QString &file, files) {
+ if (useLogger)
+ qCCritical(lcD3DService, qPrintable(file));
+ else
+ std::wcout << reinterpret_cast(file.utf16()) << std::endl;
+ }
+}
+
+static void outputQrc(const QStringList &files, bool useLogger)
+{
+ QString stream;
+ QXmlStreamWriter xml(&stream);
+ xml.setAutoFormatting(true);
+ xml.writeStartElement(QStringLiteral("RCC"));
+ xml.writeStartElement(QStringLiteral("qresource"));
+ xml.writeAttribute(QStringLiteral("prefix"), QStringLiteral("qt.d3dcompiler"));
+ foreach (const QString &file, files) {
+ xml.writeStartElement(QStringLiteral("file"));
+ xml.writeAttribute(QStringLiteral("alias"), QFileInfo(file).fileName());
+ xml.writeCharacters(file);
+ xml.writeEndElement();
+ }
+ xml.writeEndElement();
+ xml.writeEndElement();
+
+ if (useLogger)
+ qCCritical(lcD3DService, qPrintable(stream));
+ else
+ std::wcout << reinterpret_cast(stream.utf16()) << std::endl;
+}
+
+int main(int argc, char *argv[])
+{
+ QCoreApplication app(argc, argv);
+ app.setApplicationName(QStringLiteral("Qt D3D Shader Compilation Service"));
+ app.setApplicationVersion(QLatin1String(QT_VERSION_STR));
+ app.setOrganizationName(QStringLiteral("Qt Project"));
+ app.setOrganizationDomain(QStringLiteral("qt-project.org"));
+
+ QCommandLineParser parser;
+ QCommandLineOption outputOption(
+ QStringLiteral("output"),
+ QStringLiteral("Write output to a file."),
+ QStringLiteral("file"));
+ parser.addOption(outputOption);
+ QCommandLineOption verbosityOption(
+ QStringLiteral("verbose"),
+ QLatin1String("The verbosity level of the message output "
+ "(0 - silent, 1 - info, 2 - debug). Defaults to 1."),
+ QStringLiteral("level"), QStringLiteral("1"));
+ parser.addOption(verbosityOption);
+ QCommandLineOption listSourceOption(
+ QStringLiteral("list-source"),
+ QLatin1String("List the known shader sources. Use with --app and/or --device "
+ "to narrow the scope."));
+ parser.addOption(listSourceOption);
+ QCommandLineOption listBinaryOption(
+ QStringLiteral("list-binary"),
+ QLatin1String("List the known shader binaries. Use with --app and/or --device "
+ "to narrow the scope."));
+ parser.addOption(listBinaryOption);
+ QCommandLineOption appOption(
+ QStringLiteral("app"),
+ QStringLiteral("Specifies the application to act upon."),
+ QStringLiteral("name"));
+ parser.addOption(appOption);
+ QCommandLineOption deviceOption(
+ QStringLiteral("device"),
+ QStringLiteral("Specifies the device to act upon."),
+ QStringLiteral("name"));
+ parser.addOption(deviceOption);
+ QCommandLineOption qrcOption(
+ QStringLiteral("qrc"),
+ QLatin1String("Outputs the content of --list-source/--list-binary in "
+ "Qt resource file format."));
+ parser.addOption(qrcOption);
+
+ parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
+ parser.addHelpOption();
+ parser.process(app.arguments());
+
+
+ const bool useLogger = parser.isSet(outputOption);
+ const bool useQrc = parser.isSet(qrcOption);
+ const bool listSource = parser.isSet(listSourceOption);
+ const bool listBinary = parser.isSet(listBinaryOption);
+
+ if (useLogger) {
+ outputFile.setFileName(parser.value(outputOption));
+ if (!outputFile.open(QFile::WriteOnly)) {
+ qCWarning(lcD3DService) << "The output file could not be opened:"
+ << outputFile.errorString();
+ return 1;
+ }
+ qInstallMessageHandler(&outputFileMessageHandler);
+ }
+
+ if (useQrc && !(listSource || listBinary)) {
+ qCWarning(lcD3DService) << "The --qrc option is only valid with either --list-source or --list--binary.";
+ return 1;
+ }
+
+ if (listSource && listBinary) {
+ qCWarning(lcD3DService) << "Please specify only --list-binary or --list source, not both.";
+ return 1;
+ }
+
+ QStringList filterRules = QStringList() // Default logging rules
+ << QStringLiteral("qt.d3dservice.warning=true")
+ << QStringLiteral("qt.d3dservice.critical=true");
+ if (parser.isSet(verbosityOption)) {
+ bool ok;
+ uint verbosity = parser.value(verbosityOption).toUInt(&ok);
+ if (!ok || verbosity > 2) {
+ qCCritical(lcD3DService) << "Incorrect value specified for verbosity.";
+ parser.showHelp(1);
+ }
+ switch (verbosity) {
+ case 2: // Enable debug print
+ filterRules.append(QStringLiteral("qt.d3dservice.debug=true"));
+ break;
+ case 1: // Remove warnings
+ filterRules.removeFirst();
+ // fall through
+ case 0: // Silent
+ filterRules.removeFirst();
+ // fall through
+ default: // Impossible
+ break;
+ }
+ } else if (listSource || listBinary) {
+ // In list mode, silence warnings by default
+ filterRules.removeFirst();
+ }
+ QLoggingCategory::setFilterRules(filterRules.join(QLatin1Char('\n')));
+
+ const QString deviceName = parser.value(deviceOption);
+ const QString appName = parser.value(appOption);
+ QStringList devices;
+ if (listSource || listBinary)
+ devices = deviceName.isEmpty() ? D3DService::devices() : QStringList(deviceName);
+
+ if (listSource) {
+ foreach (const QString &device, devices) {
+ const QStringList apps = appName.isEmpty()
+ ? D3DService::apps(device) : QStringList(appName);
+ foreach (const QString &app, apps) {
+ const QStringList files = D3DService::sources(device, app);
+ if (useQrc)
+ outputQrc(files, useLogger);
+ else
+ outputList(files, useLogger);
+ }
+ }
+
+ return 0;
+ }
+
+ if (listBinary) {
+ foreach (const QString &device, devices) {
+ const QStringList apps = appName.isEmpty()
+ ? D3DService::apps(device) : QStringList(appName);
+ foreach (const QString &app, apps) {
+ const QStringList files = D3DService::binaries(device, app);
+ if (useQrc)
+ outputQrc(files, useLogger);
+ else
+ outputList(files, useLogger);
+ }
+ }
+
+ return 0;
+ }
+
+ // Default (start service)
+ if (!D3DService::start()) {
+ qCWarning(lcD3DService) << "The service failed to start.";
+ return 1;
+ }
+
+ return 0;
+}
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/qtd3dservice.pro qttools-opensource-src-5.3.0/src/qtd3dservice/qtd3dservice.pro
--- qttools-opensource-src-5.2.1/src/qtd3dservice/qtd3dservice.pro 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/qtd3dservice.pro 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,25 @@
+option(host_build)
+CONFIG += force_bootstrap
+
+TARGET = qtd3dservice
+
+DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII WINRT_LIBRARY WINAPI_FAMILY=WINAPI_FAMILY_DESKTOP_APP
+
+QMAKE_CXXFLAGS += -EHsc
+
+LIBS += -lruntimeobject -lsetupapi -lcredui -lsecur32
+
+SOURCES = \
+ appxhandler.cpp \
+ d3dservice.cpp \
+ main.cpp \
+ xaphandler.cpp \
+ compilation.cpp \
+ info.cpp
+
+HEADERS = \
+ d3dservice.h
+
+include(../shared/corecon/corecon.pri)
+
+load(qt_tool)
diff -Nru qttools-opensource-src-5.2.1/src/qtd3dservice/xaphandler.cpp qttools-opensource-src-5.3.0/src/qtd3dservice/xaphandler.cpp
--- qttools-opensource-src-5.2.1/src/qtd3dservice/xaphandler.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtd3dservice/xaphandler.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,403 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "d3dservice.h"
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+using namespace Microsoft::WRL;
+
+#include
+#include
+Q_GLOBAL_STATIC(CoreConServer, coreConServer)
+
+#define bstr(s) _bstr_t((const wchar_t *)s.utf16())
+
+static bool isEmulatorRunning(CoreConDevice *device)
+{
+ const QString deviceName = device->name();
+ HWND window = FindWindow(NULL, reinterpret_cast(deviceName.utf16()));
+ if (!window)
+ return false;
+
+ // Sanity check: make sure the window belongs to XDE
+ DWORD processId = 0;
+ GetWindowThreadProcessId(window, &processId);
+ if (!processId) {
+ qCDebug(lcD3DService) << "Unable to get process ID for window:"
+ << qt_error_string(GetLastError());
+ return false;
+ }
+
+ HANDLE process = OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
+ if (!process) {
+ qCDebug(lcD3DService) << "Unable to open process:"
+ << qt_error_string(GetLastError());
+ return false;
+ }
+
+ WCHAR imageName[MAX_PATH];
+ DWORD imageNameSize = MAX_PATH;
+ if (!QueryFullProcessImageName(process, 0, imageName, &imageNameSize)) {
+ qCDebug(lcD3DService) << "Unable to query process:" << imageName
+ << qt_error_string(GetLastError());
+ CloseHandle(process);
+ return false;
+ }
+ CloseHandle(process);
+
+ // Fuzzy logic: simply check that the owning process is XDE
+ const QString imageNameString = QString::fromWCharArray(imageName);
+ if (imageNameString.endsWith(QStringLiteral("XDE.exe")))
+ return true;
+
+ return false;
+}
+
+// This is used by the service to simplify gathering of device data
+extern QStringList xapDeviceNames()
+{
+ if (!coreConServer->initialize()) {
+ while (!coreConServer.exists())
+ Sleep(1);
+ }
+
+ QStringList deviceNames;
+ foreach (const CoreConDevice *device, coreConServer->devices())
+ deviceNames.append(device->name());
+
+ return deviceNames;
+}
+
+// Allows looking up of application names
+extern int xapAppNames(int deviceIndex, QSet &apps)
+{
+ if (!coreConServer->initialize()) {
+ while (!coreConServer.exists())
+ Sleep(1);
+ }
+
+ CoreConDevice *device = coreConServer->devices().value(deviceIndex, 0);
+ if (!device) {
+ qCWarning(lcD3DService) << "Device at index" << deviceIndex << "not found.";
+ return 1;
+ }
+
+ // For emulators, check that XDE is still running
+ if (device->isEmulator() && !isEmulatorRunning(device)) {
+ qCWarning(lcD3DService) << "The emulator" << device->name()
+ << "does not appear to be running.";
+ return 1;
+ }
+
+ HRESULT hr;
+ _bstr_t connectionName;
+ ComPtr connection;
+ hr = coreConServer->handle()->GetConnection(
+ device->handle(), 5000, NULL, connectionName.GetAddress(), &connection);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to initialize connection:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+
+ hr = connection->ConnectDevice();
+ // For phones, we wait around for a pin unlock (or a different error)
+ if (!device->isEmulator()) {
+ while (hr == 0x89740006) { // Device is pinlocked
+ qCDebug(lcD3DService) << coreConServer->formatError(hr);
+ Sleep(1000);
+ hr = connection->ConnectDevice();
+ }
+ }
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to connect to device:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+
+ ComPtr connection3;
+ hr = connection.As(&connection3);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to obtain connection3 interface:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+
+ SAFEARRAY *productIds, *instanceIds;
+ hr = connection3->GetInstalledApplicationIDs(&productIds, &instanceIds);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to get installed applications:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+ if (productIds && instanceIds) {
+ Q_ASSERT(productIds->rgsabound[0].cElements == instanceIds->rgsabound[0].cElements);
+ for (ulong i = 0; i < productIds->rgsabound[0].cElements; ++i) {
+ LONG indices[] = { i };
+ _bstr_t productId;
+ _bstr_t instanceId;
+ if (SUCCEEDED(SafeArrayGetElement(productIds, indices, productId.GetAddress()))
+ && SUCCEEDED(SafeArrayGetElement(instanceIds, indices, instanceId.GetAddress()))) {
+ apps.insert(QString::fromWCharArray(productId));
+ }
+ }
+ SafeArrayDestroy(productIds);
+ SafeArrayDestroy(instanceIds);
+ return 0;
+ }
+
+ // No installed applications
+ return 0;
+}
+
+/* This method runs in its own thread for each CoreCon device/application combo
+ * the service is currently handling. */
+extern int handleXapDevice(int deviceIndex, const QString &app, const QString &localBase, HANDLE runLock)
+{
+ if (!coreConServer->initialize()) {
+ while (!coreConServer.exists())
+ Sleep(1);
+ }
+
+ CoreConDevice *device = coreConServer->devices().value(deviceIndex, 0);
+ if (!device) {
+ qCWarning(lcD3DService) << "Device at index" << deviceIndex << "not found.";
+ return 1;
+ }
+
+ // For emulators, check that XDE is still running
+ if (device->isEmulator() && !isEmulatorRunning(device)) {
+ qCWarning(lcD3DService) << "The emulator" << device->name()
+ << "does not appear to be running.";
+ return 1;
+ }
+
+ const QString localSourcePath = localBase + QStringLiteral("\\source\\");
+ const QString localBinaryPath = localBase + QStringLiteral("\\binary\\");
+
+ const QString remoteBase = QStringLiteral("%FOLDERID_APPID_ISOROOT%\\")
+ + app + QStringLiteral("\\d3dcompiler");
+ const QString remoteSourcePath = remoteBase + QStringLiteral("\\source\\");
+ const QString remoteBinaryPath = remoteBase + QStringLiteral("\\binary\\");
+
+ HRESULT hr;
+ _bstr_t connectionName;
+ ComPtr connection;
+ hr = coreConServer->handle()->GetConnection(
+ device->handle(), 5000, NULL, connectionName.GetAddress(), &connection);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to initialize connection:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+
+ ComPtr connection3;
+ hr = connection.As(&connection3);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to obtain connection3 interface:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+
+ ComPtr connection4;
+ hr = connection.As(&connection4);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to obtain connection4 interface:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+
+ bool wasDisconnected = true;
+ forever {
+ // If the run lock is signaled, it's time to quit
+ if (WaitForSingleObject(runLock, 0) == WAIT_OBJECT_0)
+ return 0;
+
+ VARIANT_BOOL connected;
+ hr = connection->IsConnected(&connected);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to query connection state:"
+ << coreConServer->formatError(hr);
+ Sleep(1000);
+ continue;
+ }
+
+ if (!connected) {
+ hr = connection->ConnectDevice();
+ connected = SUCCEEDED(hr);
+ if (connected) {
+ qCWarning(lcD3DService).nospace() << "Connected to " << device->name() << ".";
+ wasDisconnected = true;
+ } else {
+ qCDebug(lcD3DService).nospace() << "Unable to connect to " << device->name()
+ << ": " << coreConServer->formatError(hr);
+ return 1;
+ }
+ }
+
+ VARIANT_BOOL isInstalled;
+ hr = connection3->IsApplicationInstalled(bstr(app), &isInstalled);
+ if (FAILED(hr)) {
+ qCCritical(lcD3DService) << "Unable to determine if package is installed:"
+ << coreConServer->formatError(hr);
+ return 1;
+ }
+ if (!isInstalled) {
+ qCWarning(lcD3DService) << "Package" << app << "is not installed. Exiting worker.";
+ return 1;
+ }
+
+ // Run certain setup steps once per connection
+ if (wasDisconnected) {
+ FileInfo remoteDirectoryInfo;
+ hr = connection->GetFileInfo(bstr(remoteSourcePath), &remoteDirectoryInfo);
+ if (FAILED(hr)) {
+ if (hr != 0x80070002 && hr != 0x80070003 /* Not found */) {
+ qCWarning(lcD3DService) << "Unable to get remote directory info:"
+ << coreConServer->formatError(hr);
+ Sleep(1000);
+ continue;
+ }
+
+ // Not found, create remote source path
+ hr = connection->MakeDirectory(bstr(remoteSourcePath));
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to create the shader source directory:"
+ << coreConServer->formatError(hr);
+ Sleep(1000);
+ continue;
+ }
+ }
+
+ hr = connection->GetFileInfo(bstr(remoteBinaryPath), &remoteDirectoryInfo);
+ if (FAILED(hr)) {
+ if (hr != 0x80070002 && hr != 0x80070003 /* Not found */) {
+ qCWarning(lcD3DService) << "Unable to get remote directory info:"
+ << coreConServer->formatError(hr);
+ Sleep(1000);
+ continue;
+ }
+
+ // Not found, create remote source path
+ hr = connection->MakeDirectory(bstr(remoteBinaryPath));
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to create the shader source directory:"
+ << coreConServer->formatError(hr);
+ Sleep(1000);
+ continue;
+ }
+ }
+
+ wasDisconnected = false;
+ }
+
+ // Ok, ready to check for shaders
+ SAFEARRAY *listing;
+ hr = connection4->GetDirectoryListing(bstr(remoteSourcePath), &listing);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to get the shader source directory listing:"
+ << coreConServer->formatError(hr);
+ wasDisconnected = true;
+ Sleep(1000);
+ continue;
+ }
+ QStringList shaderSources;
+ if (listing) {
+ for (ulong i = 0; i < listing->rgsabound[0].cElements; ++i) {
+ LONG indices[] = { i };
+ _bstr_t fileName;
+ if (SUCCEEDED(SafeArrayGetElement(listing, indices, fileName.GetAddress()))) {
+ // Get the file
+ QString remoteFile = remoteSourcePath + QString::fromWCharArray(fileName);
+ QString localFile = localSourcePath + QString::fromWCharArray(fileName);
+ qCDebug(lcD3DService) << "Found remote shader:" << remoteFile;
+ hr = connection->ReceiveFile(bstr(remoteFile), bstr(localFile), 2);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to retrieve the remote shader file:"
+ << remoteFile << coreConServer->formatError(hr);
+ continue;
+ }
+ // Remove the remote file, push into a list for compilation
+ shaderSources.append(localFile);
+ hr = connection->RemoveFile(bstr(remoteFile));
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to remove remote shader file:"
+ << remoteFile << coreConServer->formatError(hr);
+ continue;
+ }
+ }
+ }
+ SafeArrayDestroy(listing);
+ }
+
+ foreach (const QString &shaderSource, shaderSources) {
+ const QString shaderFileName = QFileInfo(shaderSource).fileName();
+ const QString localBinary = localBinaryPath + shaderFileName;
+ hr = D3DService::compileShader(shaderSource, localBinary);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to compile shader:" << shaderSource
+ << coreConServer->formatError(hr);
+ continue;
+ }
+
+ // All went well, upload the file
+ const QString remoteBinary = remoteBinaryPath + shaderFileName;
+ hr = connection->SendFile(bstr(localBinary), bstr(remoteBinary), CREATE_ALWAYS, NULL);
+ if (FAILED(hr)) {
+ qCWarning(lcD3DService) << "Unable to upload binary:"
+ << remoteBinary << coreConServer->formatError(hr);
+ continue;
+ }
+
+ qCDebug(lcD3DService) << "Compiled local shader to:" << localBinary
+ << "and uploaded to" << remoteBinary;
+ }
+
+ // Done, take a break.
+ Sleep(1000);
+ }
+}
diff -Nru qttools-opensource-src-5.2.1/src/qtdiag/main.cpp qttools-opensource-src-5.3.0/src/qtdiag/main.cpp
--- qttools-opensource-src-5.2.1/src/qtdiag/main.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtdiag/main.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -0,0 +1,62 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtdiag.h"
+
+#include
+
+#include
+#include
+
+QT_USE_NAMESPACE
+
+int main(int argc, char **argv)
+{
+ QGuiApplication app(argc, argv);
+
+ QCoreApplication::setApplicationName(QStringLiteral("qtdiag"));
+ QCoreApplication::setApplicationVersion(QLatin1String(QT_VERSION_STR));
+ QCoreApplication::setOrganizationName(QStringLiteral("Qt Project"));
+ QCoreApplication::setOrganizationDomain(QStringLiteral("qt-project.org"));
+
+ std::wcout << qtDiag().toStdWString();
+ return 0;
+}
diff -Nru qttools-opensource-src-5.2.1/src/qtdiag/qtdiag.cpp qttools-opensource-src-5.3.0/src/qtdiag/qtdiag.cpp
--- qttools-opensource-src-5.2.1/src/qtdiag/qtdiag.cpp 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtdiag/qtdiag.cpp 2014-05-15 17:12:40.000000000 +0000
@@ -0,0 +1,313 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qtdiag.h"
+
+#include
+#include
+#include
+#include
+#include
+#ifndef QT_NO_OPENGL
+# include
+# include
+#endif // QT_NO_OPENGL
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+
+QT_BEGIN_NAMESPACE
+
+QTextStream &operator<<(QTextStream &str, const QSize &s)
+{
+ str << s.width() << 'x' << s.height();
+ return str;
+}
+
+QTextStream &operator<<(QTextStream &str, const QSizeF &s)
+{
+ str << s.width() << 'x' << s.height();
+ return str;
+}
+
+QTextStream &operator<<(QTextStream &str, const QRect &r)
+{
+ str << r.size() << '+' << r.x() << '+' << r.y();
+ return str;
+}
+
+QTextStream &operator<<(QTextStream &str, const QStringList &l)
+{
+ for (int i = 0; i < l.size(); ++i) {
+ if (i)
+ str << ',';
+ str << l.at(i);
+ }
+ return str;
+}
+
+QTextStream &operator<<(QTextStream &str, const QFont &f)
+{
+ str << '"' << f.family() << "\" " << f.pointSize();
+ return str;
+}
+
+#ifndef QT_NO_OPENGL
+
+QTextStream &operator<<(QTextStream &str, const QSurfaceFormat &format)
+{
+ str << "Version: " << format.majorVersion() << '.'
+ << format.minorVersion() << " Profile: " << format.profile()
+ << " Swap behavior: " << format.swapBehavior()
+ << " Buffer size (RGB";
+ if (format.hasAlpha())
+ str << 'A';
+ str << "): " << format.redBufferSize() << ',' << format.greenBufferSize()
+ << ',' << format.blueBufferSize();
+ if (format.hasAlpha())
+ str << ',' << format.alphaBufferSize();
+ if (const int dbs = format.depthBufferSize())
+ str << " Depth buffer: " << dbs;
+ if (const int sbs = format.stencilBufferSize())
+ str << " Stencil buffer: " << sbs;
+ const int samples = format.samples();
+ if (samples > 0)
+ str << " Samples: " << samples;
+ return str;
+}
+
+void dumpGlInfo(QTextStream &str)
+{
+ QOpenGLContext context;
+ if (context.create()) {
+# ifdef QT_OPENGL_DYNAMIC
+ str << "Dynamic GL ";
+# endif
+ switch (context.openGLModuleType()) {
+ case QOpenGLContext::LibGL:
+ str << "LibGL";
+ break;
+ case QOpenGLContext::LibGLES:
+ str << "LibGLES";
+ break;
+ }
+ QWindow window;
+ window.setSurfaceType(QSurface::OpenGLSurface);
+ window.create();
+ context.makeCurrent(&window);
+ QOpenGLFunctions functions(&context);
+
+ str << " Vendor: " << reinterpret_cast(functions.glGetString(GL_VENDOR))
+ << "\nRenderer: " << reinterpret_cast(functions.glGetString(GL_RENDERER))
+ << "\nVersion: " << reinterpret_cast(functions.glGetString(GL_VERSION))
+ << "\nShading language: " << reinterpret_cast(functions.glGetString(GL_SHADING_LANGUAGE_VERSION))
+ << "\nFormat: " << context.format();
+ } else {
+ str << "Unable to create an Open GL context.\n";
+ }
+}
+
+#endif // !QT_NO_OPENGL
+
+static QStringList toNativeSeparators(QStringList in)
+{
+ for (int i = 0; i < in.size(); ++i)
+ in[i] = QDir::toNativeSeparators(in.at(i));
+ return in;
+}
+
+#define DUMP_CAPABILITY(str, integration, capability) \
+ if (platformIntegration->hasCapability(QPlatformIntegration::capability)) \
+ str << ' ' << #capability;
+
+#define DUMP_STANDARDPATH(str, location) \
+ str << " " << #location << ": \"" \
+ << QStandardPaths::displayName(QStandardPaths::location) << '"' \
+ << ' ' << toNativeSeparators(QStandardPaths::standardLocations(QStandardPaths::location)) << '\n';
+
+#define DUMP_LIBRARYPATH(str, loc) \
+ str << " " << #loc << ": " << QDir::toNativeSeparators(QLibraryInfo::location(QLibraryInfo::loc)) << '\n';
+
+
+QString qtDiag()
+{
+ QString result;
+ QTextStream str(&result);
+
+ const QPlatformIntegration *platformIntegration = QGuiApplicationPrivate::platformIntegration();
+ str << QLibraryInfo::build() << " on \"" << QGuiApplication::platformName() << "\" "
+ << (QSysInfo::ByteOrder == QSysInfo::LittleEndian ? "little endian" : "big endian") << '/'
+ << '\n';
+
+#if defined(Q_OS_WIN)
+ str << hex << "Windows version: 0x" << QSysInfo::windowsVersion() << dec << '\n';
+#elif defined(Q_OS_MAC)
+ str << hex << "Mac OS version: 0x" << QSysInfo::macVersion() << dec << '\n';
+#endif
+
+ str << "\nLibrary info:\n";
+ DUMP_LIBRARYPATH(str, PrefixPath)
+ DUMP_LIBRARYPATH(str, DocumentationPath)
+ DUMP_LIBRARYPATH(str, HeadersPath)
+ DUMP_LIBRARYPATH(str, LibrariesPath)
+ DUMP_LIBRARYPATH(str, LibraryExecutablesPath)
+ DUMP_LIBRARYPATH(str, BinariesPath)
+ DUMP_LIBRARYPATH(str, PluginsPath)
+ DUMP_LIBRARYPATH(str, ImportsPath)
+ DUMP_LIBRARYPATH(str, Qml2ImportsPath)
+ DUMP_LIBRARYPATH(str, ArchDataPath)
+ DUMP_LIBRARYPATH(str, DataPath)
+ DUMP_LIBRARYPATH(str, TranslationsPath)
+ DUMP_LIBRARYPATH(str, ExamplesPath)
+ DUMP_LIBRARYPATH(str, TestsPath)
+
+ str << "\nStandard paths:\n";
+ DUMP_STANDARDPATH(str, DesktopLocation)
+ DUMP_STANDARDPATH(str, DocumentsLocation)
+ DUMP_STANDARDPATH(str, FontsLocation)
+ DUMP_STANDARDPATH(str, ApplicationsLocation)
+ DUMP_STANDARDPATH(str, MusicLocation)
+ DUMP_STANDARDPATH(str, MoviesLocation)
+ DUMP_STANDARDPATH(str, PicturesLocation)
+ DUMP_STANDARDPATH(str, TempLocation)
+ DUMP_STANDARDPATH(str, HomeLocation)
+ DUMP_STANDARDPATH(str, DataLocation)
+ DUMP_STANDARDPATH(str, CacheLocation)
+ DUMP_STANDARDPATH(str, GenericDataLocation)
+ DUMP_STANDARDPATH(str, RuntimeLocation)
+ DUMP_STANDARDPATH(str, ConfigLocation)
+ DUMP_STANDARDPATH(str, DownloadLocation)
+ DUMP_STANDARDPATH(str, GenericCacheLocation)
+
+ str << "\nPlatform capabilities:";
+ DUMP_CAPABILITY(str, platformIntegration, ThreadedPixmaps)
+ DUMP_CAPABILITY(str, platformIntegration, OpenGL)
+ DUMP_CAPABILITY(str, platformIntegration, ThreadedOpenGL)
+ DUMP_CAPABILITY(str, platformIntegration, SharedGraphicsCache)
+ DUMP_CAPABILITY(str, platformIntegration, BufferQueueingOpenGL)
+ DUMP_CAPABILITY(str, platformIntegration, WindowMasks)
+ DUMP_CAPABILITY(str, platformIntegration, MultipleWindows)
+ DUMP_CAPABILITY(str, platformIntegration, ApplicationState)
+ DUMP_CAPABILITY(str, platformIntegration, ForeignWindows)
+ DUMP_CAPABILITY(str, platformIntegration, AllGLFunctionsQueryable)
+ str << '\n';
+
+ const QStyleHints *styleHints = QGuiApplication::styleHints();
+ str << "\nStyle hints:\n mouseDoubleClickInterval: " << styleHints->mouseDoubleClickInterval() << '\n'
+ << " startDragDistance: " << styleHints->startDragDistance() << '\n'
+ << " startDragTime: " << styleHints->startDragTime() << '\n'
+ << " startDragVelocity: " << styleHints->startDragVelocity() << '\n'
+ << " keyboardInputInterval: " << styleHints->keyboardInputInterval() << '\n'
+ << " keyboardAutoRepeatRate: " << styleHints->keyboardAutoRepeatRate() << '\n'
+ << " cursorFlashTime: " << styleHints->cursorFlashTime() << '\n'
+ << " showIsFullScreen: " << styleHints->showIsFullScreen() << '\n'
+ << " passwordMaskDelay: " << styleHints->passwordMaskDelay() << '\n'
+ << " fontSmoothingGamma: " << styleHints->fontSmoothingGamma() << '\n'
+ << " useRtlExtensions: " << styleHints->useRtlExtensions() << '\n'
+ << " mousePressAndHoldInterval: " << styleHints->mousePressAndHoldInterval() << '\n';
+
+ const QPlatformTheme *platformTheme = QGuiApplicationPrivate::platformTheme();
+ str << "\nTheme:\n Styles: " << platformTheme->themeHint(QPlatformTheme::StyleNames).toStringList();
+ const QString iconTheme = platformTheme->themeHint(QPlatformTheme::SystemIconThemeName).toString();
+ if (!iconTheme.isEmpty()) {
+ str << "\n Icon theme: " << iconTheme
+ << ", " << platformTheme->themeHint(QPlatformTheme::SystemIconFallbackThemeName).toString()
+ << " from " << platformTheme->themeHint(QPlatformTheme::IconThemeSearchPaths).toStringList() << '\n';
+ }
+ if (const QFont *systemFont = platformTheme->font())
+ str << " System font: " << *systemFont<< '\n';
+ str << " General font : " << QFontDatabase::systemFont(QFontDatabase::GeneralFont) << '\n'
+ << " Fixed font : " << QFontDatabase::systemFont(QFontDatabase::FixedFont) << '\n'
+ << " Title font : " << QFontDatabase::systemFont(QFontDatabase::TitleFont) << '\n'
+ << " Smallest font: " << QFontDatabase::systemFont(QFontDatabase::SmallestReadableFont) << "\n\n";
+
+ if (platformTheme->usePlatformNativeDialog(QPlatformTheme::FileDialog))
+ str << " Native file dialog\n";
+ if (platformTheme->usePlatformNativeDialog(QPlatformTheme::ColorDialog))
+ str << " Native color dialog\n";
+ if (platformTheme->usePlatformNativeDialog(QPlatformTheme::FontDialog))
+ str << " Native font dialog\n";
+
+ const QList screens = QGuiApplication::screens();
+ const int screenCount = screens.size();
+ str << "\nScreens: " << screenCount << '\n';
+ for (int s = 0; s < screenCount; ++s) {
+ const QScreen *screen = screens.at(s);
+ str << (screen == QGuiApplication::primaryScreen() ? '*' : ' ')
+ << '#' << ' ' << s << " \"" << screen->name() << '"'
+ << " Depth: " << screen->depth()
+ << "\n Geometry: " << screen->geometry() << " Available: " << screen->availableGeometry();
+ if (screen->geometry() != screen->virtualGeometry())
+ str << "\n Virtual geometry: " << screen->virtualGeometry() << " Available: " << screen->availableVirtualGeometry();
+ if (screen->virtualSiblings().size() > 1)
+ str << "\n " << screen->virtualSiblings().size() << " virtual siblings";
+ str << "\n Physical size: " << screen->physicalSize() << " mm"
+ << " Refresh: " << screen->refreshRate() << " Hz"
+ << "\n Physical DPI: " << screen->physicalDotsPerInchX()
+ << ',' << screen->physicalDotsPerInchY()
+ << " Logical DPI: " << screen->logicalDotsPerInchX()
+ << ',' << screen->logicalDotsPerInchY()
+ << "\n DevicePixelRatio: " << screen->devicePixelRatio()
+ << " Primary orientation: " << screen->primaryOrientation()
+ << "\n Orientation: " << screen->orientation()
+ << " OrientationUpdateMask: " << screen->orientationUpdateMask()
+ << "\n\n";
+ }
+
+#ifndef QT_NO_OPENGL
+ dumpGlInfo(str);
+ str << "\n\n";
+#endif // !QT_NO_OPENGL
+ return result;
+}
+
+QT_END_NAMESPACE
diff -Nru qttools-opensource-src-5.2.1/src/qtdiag/qtdiag.h qttools-opensource-src-5.3.0/src/qtdiag/qtdiag.h
--- qttools-opensource-src-5.2.1/src/qtdiag/qtdiag.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtdiag/qtdiag.h 2014-05-15 17:12:40.000000000 +0000
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QTDIAG_H
+#define QTDIAG_H
+
+#include
+
+QT_BEGIN_NAMESPACE
+
+QString qtDiag();
+
+QT_END_NAMESPACE
+
+#endif // QTDIAG_H
diff -Nru qttools-opensource-src-5.2.1/src/qtdiag/qtdiag.pro qttools-opensource-src-5.3.0/src/qtdiag/qtdiag.pro
--- qttools-opensource-src-5.2.1/src/qtdiag/qtdiag.pro 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtdiag/qtdiag.pro 2014-05-15 17:12:40.000000000 +0000
@@ -0,0 +1,7 @@
+load(qt_app)
+
+CONFIG += console
+QT += core-private gui-private
+
+SOURCES += main.cpp qtdiag.cpp
+HEADERS += qtdiag.h
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsync/qtcesterconnection.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -91,12 +91,12 @@
qDebug() << "Could not open File!";
return false;
}
-
+
QTcpSocket* socket = 0;
if (!_initCommand(socket, COMMAND_CREATE_FILE)) {
END_ERROR(socket, "Could not initialized command");
}
-
+
CreateFileOptions option;
strcpy(option.fileName, qPrintable(deviceDest));
#ifdef Q_OS_WIN
@@ -116,7 +116,7 @@
#endif
option.fileSize = info.size();
option.overwriteExisting = !failIfExists;
-
+
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send options...");
}
@@ -124,7 +124,7 @@
if (!_checkResult(socket)) {
END_ERROR(socket, "Server did not accept configuration");
}
-
+
int bytesWritten = 0;
const int bufferSize = 1024;
QByteArray data;
@@ -159,7 +159,7 @@
if (!info.exists() || !info.isDir()) {
END_ERROR(socket, "Input directory invalid");
}
-
+
createDirectory(deviceDest, true);
QDir dir(localSource);
QFileInfoList list = dir.entryInfoList(QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot);
@@ -185,31 +185,31 @@
if (targetFile.exists() && failIfExists) {
END_ERROR(socket, "Local file not supposed to be overwritten");
}
-
+
if (!targetFile.open(QIODevice::WriteOnly | QIODevice::Truncate)) {
END_ERROR(socket, "Could not open local file for writing");
}
-
+
if (!_initCommand(socket, COMMAND_READ_FILE)) {
END_ERROR(socket, "Could not establish connection");
}
-
+
ReadFileOptions option;
strcpy(option.fileName, qPrintable(deviceSource));
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send options");
}
-
+
QByteArray data;
if (!_receiveData(socket, data)) {
END_ERROR(socket, "Did not receive any data");
}
-
+
ReadFileReply* reply = (ReadFileReply*) data.data();
if (!reply->fileValid) {
END_ERROR(socket, "Requested file invalid");
}
-
+
int fileSize = reply->fileSize;
int currentSize = 0;
// ### TODO: make a little bit more error-prone
@@ -219,12 +219,12 @@
currentSize += data.size();
targetFile.write(data);
} while(currentSize < fileSize);
-
+
_freeSocket(socket);
targetFile.close();
return true;
}
-
+
bool QtCesterConnection::copyDirectoryFromDevice(const QString& /*deviceSource*/
, const QString& /*localDest*/
, bool /*recursive*/)
@@ -240,7 +240,7 @@
if (!_initCommand(socket, COMMAND_COPY_FILE)) {
END_ERROR(socket, "Could not establish connection for copy");
}
-
+
CopyFileOptions option;
strcpy(option.from, qPrintable(srcFile));
strcpy(option.to, qPrintable(destFile));
@@ -248,11 +248,11 @@
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send copy options");
}
-
+
if (!_checkResult(socket)) {
END_ERROR(socket, "Copy failed");
}
-
+
_freeSocket(socket);
return true;
}
@@ -264,7 +264,7 @@
if (!_initCommand(socket, COMMAND_COPY_DIRECTORY)) {
END_ERROR(socket, "Could not establish connection for dir copy");
}
-
+
CopyDirectoryOptions option;
strcpy(option.from, qPrintable(srcDirectory));
strcpy(option.to, qPrintable(destDirectory));
@@ -272,11 +272,11 @@
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send dir copy options");
}
-
+
if (!_checkResult(socket)) {
END_ERROR(socket, "Dir Copy failed");
}
-
+
_freeSocket(socket);
return true;
}
@@ -287,18 +287,18 @@
if (!_initCommand(socket, COMMAND_DELETE_FILE)) {
END_ERROR(socket, "Could not establish connection for file deletion");
}
-
+
DeleteFileOptions option;
strcpy(option.fileName, qPrintable(fileName));
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send file options");
}
-
+
if (!_checkResult(socket)) {
//END_ERROR(socket, "File Deletion failed");
// This is actually not an error so ignore it.
}
-
+
_freeSocket(socket);
return true;
}
@@ -309,7 +309,7 @@
if (!_initCommand(socket, COMMAND_DELETE_DIRECTORY)) {
END_ERROR(socket, "Could not establish connection for dir deletion");
}
-
+
DeleteDirectoryOptions option;
strcpy(option.dirName, qPrintable(directory));
option.recursive = recursive;
@@ -317,12 +317,12 @@
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send dir options");
}
-
+
if (!_checkResult(socket)) {
// we do not write an error as this will fail a lot on recursive.
END_ERROR(socket, 0);
}
-
+
_freeSocket(socket);
return true;
}
@@ -365,19 +365,19 @@
if (!_sendData(socket, COMMAND_SUCCESS, strlen(COMMAND_SUCCESS))) {
END_ERROR(socket, "Could not trigger startup");
}
-
+
const int waitTime = 60 * 60 * 1000;
if (!socket->waitForReadyRead(waitTime)) {
END_ERROR(socket, "Process timed out");
}
-
+
QByteArray result = socket->readAll();
if (result != COMMAND_SUCCESS) {
if (returnValue)
*returnValue = -1; // just some at least
END_ERROR(socket, "Application did not start or returned error");
}
-
+
if (returnValue)
*returnValue = 0;
_freeSocket(socket);
@@ -388,23 +388,23 @@
{
if (deleteBefore)
deleteDirectory(path, true, true);
-
+
QTcpSocket* socket = 0;
if (!_initCommand(socket, COMMAND_CREATE_DIRECTORY)) {
END_ERROR(socket, "Could not establish connection for dir creation");
}
-
+
CreateDirectoryOptions option;
strcpy(option.dirName, qPrintable(path));
option.recursively = true;
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send dir options");
}
-
+
if (!_checkResult(socket)) {
END_ERROR(socket, "Dir creation failed");
}
-
+
_freeSocket(socket);
return true;
}
@@ -413,29 +413,29 @@
{
if (!fTime)
return false;
-
+
FILETIME copyTime = *fTime;
LocalFileTimeToFileTime(©Time, ©Time);
-
+
QTcpSocket* socket = 0;
if (!_initCommand(socket, COMMAND_TIME_STAMP)) {
END_ERROR(socket, "Could not establish time stamp connection");
}
-
+
if (!_sendData(socket, (char*) ©Time, sizeof(copyTime))) {
END_ERROR(socket, "Could not send stamp time");
}
-
+
QByteArray data;
if (!_receiveData(socket, data)) {
END_ERROR(socket, "Did not receive time stamp or connection interrupted");
}
-
+
copyTime = *((FILETIME*)data.data());
if (copyTime.dwLowDateTime == -1 && copyTime.dwHighDateTime == -1) {
END_ERROR(socket, "remote Time stamp failed!");
}
-
+
*fTime = copyTime;
_freeSocket(socket);
return true;
@@ -445,29 +445,29 @@
{
if (!deviceCreationTime)
return false;
-
+
QTcpSocket* socket = 0;
if (!_initCommand(socket, COMMAND_FILE_TIME)) {
END_ERROR(socket, "Could not establish connection for file time access");
}
-
+
FileTimeOptions option;
strcpy(option.fileName, qPrintable(fileName));
if (!_sendData(socket, (char*) &option, sizeof(option))) {
END_ERROR(socket, "Could not send file time name");
}
-
+
QByteArray data;
if (!_receiveData(socket, data)) {
END_ERROR(socket, "File Time request failed");
}
-
+
FILETIME* resultTime = (FILETIME*) data.data();
if (resultTime->dwLowDateTime == -1 && resultTime->dwHighDateTime == -1) {
END_ERROR(socket, 0);
debugOutput("Could not access file time", 0);
}
-
+
*deviceCreationTime = *resultTime;
_freeSocket(socket);
return true;
@@ -482,7 +482,7 @@
exit(0);
}
sock->connectToHost(QHostAddress(QString(ipAddress)), 12145);
-
+
if (!sock->waitForConnected()) {
qDebug() << "connection timeout...";
result = NULL;
@@ -514,8 +514,8 @@
if (!_createSocket(socket)) {
END_ERROR(socket, "Could not connect to server");
}
-
- if (!_sendData(socket, command, strlen(command)) ||
+
+ if (!_sendData(socket, command, strlen(command)) ||
!_checkResult(socket)) {
END_ERROR(socket, "Cound not send command");
}
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsync/remoteconnection.h qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsync/remoteconnection.h
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsync/remoteconnection.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsync/remoteconnection.h 2014-05-15 17:12:39.000000000 +0000
@@ -64,7 +64,7 @@
// For "intelligent deployment" we need to investigate on filetimes on the device
virtual bool timeStampForLocalFileTime(FILETIME*) const = 0;
virtual bool fileCreationTime(const QString &fileName, FILETIME*) const = 0;
-
+
// These functions only work on files existing on the device
virtual bool copyFile(const QString&, const QString&, bool failIfExists = false) = 0;
virtual bool copyDirectory(const QString&, const QString&, bool recursive = true) = 0;
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsyncserver/commands.cpp qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsyncserver/commands.cpp
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsyncserver/commands.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsyncserver/commands.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -82,7 +82,7 @@
debugOutput(1, "AbstractCommand::commandFinished()NOT SUPPOSED TO BE HERE");
}
-void AbstractCommand::setSocket(QTcpSocket* socket)
+void AbstractCommand::setSocket(QTcpSocket* socket)
{
debugOutput(0, "AbstractCommand::setSocket()");
Q_ASSERT(socket);
@@ -91,9 +91,9 @@
reportSuccess();
}
-QTcpSocket* AbstractCommand::socket()
-{
- return m_socket;
+QTcpSocket* AbstractCommand::socket()
+{
+ return m_socket;
}
void AbstractCommand::_readData()
@@ -158,7 +158,7 @@
m_file.close();
}
}
-
+
if (successful)
reportSuccess();
else
@@ -205,7 +205,7 @@
success = dir.mkpath(options->dirName);
else
success = dir.mkdir(options->dirName);
-
+
if (success)
reportSuccess();
else
@@ -246,7 +246,7 @@
if (success)
if (!QFile::copy(options->from , options->to))
success = false;
-
+
if (success)
reportSuccess();
else
@@ -423,7 +423,7 @@
void ExecuteCommand::dataReceived(QByteArray &data)
{
debugOutput(0, "ExecuteCommand::dataReceived()");
-
+
if (m_argumentCount == 0) {
ExecuteOptions* options = (ExecuteOptions*) data.data();
if (!QFileInfo(options->appName).exists()) {
@@ -431,7 +431,7 @@
reportError();
return;
}
-
+
m_program = QLatin1String(options->appName);
m_argumentCount = options->argumentsCount;
m_waitFinished = options->waitForFinished;
@@ -610,7 +610,7 @@
FILETIME resultTime;
resultTime.dwLowDateTime = -1;
resultTime.dwHighDateTime = -1;
-
+
#ifdef Q_OS_WIN
QString fileName = QLatin1String(option->fileName);
HANDLE deviceHandle = CreateFile(fileName.utf16(), GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0);
@@ -653,10 +653,10 @@
FILETIME resultTime;
resultTime.dwLowDateTime = -1;
resultTime.dwHighDateTime = -1;
-
+
#ifdef Q_OS_WIN
FILETIME stampTime = *((FILETIME*)data.data());
-
+
QString tmpFile = QString::fromLatin1("\\qt_tmp_ftime_convert");
HANDLE remoteHandle = CreateFile(tmpFile.utf16(), GENERIC_WRITE, 0, 0, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, 0);
if (remoteHandle != INVALID_HANDLE_VALUE) {
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsyncserver/commands.h qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsyncserver/commands.h
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsyncserver/commands.h 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsyncserver/commands.h 2014-05-15 17:12:39.000000000 +0000
@@ -116,7 +116,7 @@
public:
CreateDirectoryCommand();
~CreateDirectoryCommand();
-
+
public slots:
void dataReceived(QByteArray&);
void commandFinished();
@@ -130,7 +130,7 @@
public:
CopyFileCommand();
~CopyFileCommand();
-
+
public slots:
void dataReceived(QByteArray&);
void commandFinished();
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsyncserver/main.cpp qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsyncserver/main.cpp
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/cetcpsyncserver/main.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/cetcpsyncserver/main.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -55,7 +55,7 @@
int main(int argc, char **argv)
{
qInstallMessageHandler(messageOutput);
-
+
QCoreApplication app(argc, argv);
ConnectionManager manager;
manager.init();
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/cetest/deployment.cpp qttools-opensource-src-5.3.0/src/qtestlib/wince/cetest/deployment.cpp
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/cetest/deployment.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/cetest/deployment.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -84,7 +84,7 @@
copyList.append(deploymentList.at(i));
continue;
}
-
+
int res = CompareFileTime(&localCreationTime, &deviceCreationTime);
if (res != 0)
copyList.append(deploymentList.at(i));
@@ -253,7 +253,7 @@
if(dirstr.right(Option::dir_sep.length()) != Option::dir_sep)
dirstr += Option::dir_sep;
QFileInfo info(dirstr + filestr);
-
+
static int addQMakeDeployCounter = 0;
QStringList entryList = info.absoluteDir().entryList(QStringList() << info.fileName());
if (entryList.size() > 1) {
@@ -270,7 +270,7 @@
}
continue;
}
-
+
if (info.isDir()) {
QDir additionalDir(dirstr + filestr);
QStringList additionalEntries = additionalDir.entryList(QDir::NoDotAndDotDot | QDir::AllEntries | QDir::NoSymLinks);
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/cetest/main.cpp qttools-opensource-src-5.3.0/src/qtestlib/wince/cetest/main.cpp
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/cetest/main.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/cetest/main.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -382,7 +382,7 @@
int retryCount = 21;
while (--retryCount)
{
- if (!connection.connect())
+ if (!connection.connect())
Sleep(SLEEP_RECONNECT);
else
break;
diff -Nru qttools-opensource-src-5.2.1/src/qtestlib/wince/remotelib/commands.cpp qttools-opensource-src-5.3.0/src/qtestlib/wince/remotelib/commands.cpp
--- qttools-opensource-src-5.2.1/src/qtestlib/wince/remotelib/commands.cpp 2014-02-01 20:37:57.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/qtestlib/wince/remotelib/commands.cpp 2014-05-15 17:12:39.000000000 +0000
@@ -131,13 +131,13 @@
\brief Reset the device.
*/
int qRemoteSoftReset(DWORD, BYTE*, DWORD*, BYTE**, IRAPIStream* stream)
-{
- //POWER_STATE_ON On state
- //POWER_STATE_OFF Off state
- //POWER_STATE_CRITICAL Critical state
- //POWER_STATE_BOOT Boot state
- //POWER_STATE_IDLE Idle state
- //POWER_STATE_SUSPEND Suspend state
+{
+ //POWER_STATE_ON On state
+ //POWER_STATE_OFF Off state
+ //POWER_STATE_CRITICAL Critical state
+ //POWER_STATE_BOOT Boot state
+ //POWER_STATE_IDLE Idle state
+ //POWER_STATE_SUSPEND Suspend state
//POWER_STATE_RESET Reset state
DWORD returnValue = SetSystemPowerState(0, POWER_STATE_RESET, POWER_FORCE);
@@ -159,16 +159,16 @@
if (S_OK != stream->Read(&toggleVal, sizeof(toggleVal), &bytesRead))
return -2;
- //PPN_REEVALUATESTATE 0x0001 Reserved. Set dwData to zero (0).
- //PPN_POWERCHANGE 0x0002 Reserved. Set dwData to zero (0).
- //PPN_UNATTENDEDMODE 0x0003 Set dwData to TRUE or FALSE.
+ //PPN_REEVALUATESTATE 0x0001 Reserved. Set dwData to zero (0).
+ //PPN_POWERCHANGE 0x0002 Reserved. Set dwData to zero (0).
+ //PPN_UNATTENDEDMODE 0x0003 Set dwData to TRUE or FALSE.
//PPN_SUSPENDKEYPRESSED or
- //PPN_POWERBUTTONPRESSED 0x0004 Reserved. Set dwData to zero (0).
- //PPN_SUSPENDKEYRELEASED 0x0005 Reserved. Set dwData to zero (0).
- //PPN_APPBUTTONPRESSED 0x0006 Reserved. Set dwData to zero (0).
- //PPN_OEMBASE Greater than or equal to 0x10000
+ //PPN_POWERBUTTONPRESSED 0x0004 Reserved. Set dwData to zero (0).
+ //PPN_SUSPENDKEYRELEASED 0x0005 Reserved. Set dwData to zero (0).
+ //PPN_APPBUTTONPRESSED 0x0006 Reserved. Set dwData to zero (0).
+ //PPN_OEMBASE Greater than or equal to 0x10000
//You can define higher values, such as 0x10001, 0x10002, and so on.
- // Reserved. Set dwData to zero (0).
+ // Reserved. Set dwData to zero (0).
returnValue = PowerPolicyNotify(PPN_UNATTENDEDMODE, toggleVal);
if (S_OK != stream->Write(&returnValue, sizeof(returnValue), &bytesRead))
@@ -192,16 +192,16 @@
if (S_OK != stream->Read(&toggleVal, sizeof(toggleVal), &bytesRead))
return -2;
- //PPN_REEVALUATESTATE 0x0001 Reserved. Set dwData to zero (0).
- //PPN_POWERCHANGE 0x0002 Reserved. Set dwData to zero (0).
- //PPN_UNATTENDEDMODE 0x0003 Set dwData to TRUE or FALSE.
+ //PPN_REEVALUATESTATE 0x0001 Reserved. Set dwData to zero (0).
+ //PPN_POWERCHANGE 0x0002 Reserved. Set dwData to zero (0).
+ //PPN_UNATTENDEDMODE 0x0003 Set dwData to TRUE or FALSE.
//PPN_SUSPENDKEYPRESSED or
- //PPN_POWERBUTTONPRESSED 0x0004 Reserved. Set dwData to zero (0).
- //PPN_SUSPENDKEYRELEASED 0x0005 Reserved. Set dwData to zero (0).
- //PPN_APPBUTTONPRESSED 0x0006 Reserved. Set dwData to zero (0).
- //PPN_OEMBASE Greater than or equal to 0x10000
+ //PPN_POWERBUTTONPRESSED 0x0004 Reserved. Set dwData to zero (0).
+ //PPN_SUSPENDKEYRELEASED 0x0005 Reserved. Set dwData to zero (0).
+ //PPN_APPBUTTONPRESSED 0x0006 Reserved. Set dwData to zero (0).
+ //PPN_OEMBASE Greater than or equal to 0x10000
//You can define higher values, such as 0x10001, 0x10002, and so on.
- // Reserved. Set dwData to zero (0).
+ // Reserved. Set dwData to zero (0).
returnValue = PowerPolicyNotify(PPN_SUSPENDKEYPRESSED, 0);
if (S_OK != stream->Write(&returnValue, sizeof(returnValue), &bytesRead))
diff -Nru qttools-opensource-src-5.2.1/src/shared/corecon/ccapi.h qttools-opensource-src-5.3.0/src/shared/corecon/ccapi.h
--- qttools-opensource-src-5.2.1/src/shared/corecon/ccapi.h 1970-01-01 00:00:00.000000000 +0000
+++ qttools-opensource-src-5.3.0/src/shared/corecon/ccapi.h 2014-05-15 17:12:39.000000000 +0000
@@ -0,0 +1,279 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the tools applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names
+** of its contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef CCAPI_H
+#define CCAPI_H
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Core Connectivity API (Experimental)
+ *
+ * These interfaces for deploying to Windows Phone devices are available as
+ * registered DLLs if the Windows Phone tools have been installed.
+ * As the IDL is not part of the Windows SDK, these interfaces were crafted by
+ * hand via the MSDN documentation and the information gathered by OLEView.
+ * As a consequence, not all interfaces have been stubbed out, and not all
+ * methods have been tested. This means that some methods may end up in the
+ * wrong position in the vtable, causing unexpected behavior or crashes.
+ * You have been warned!
+ *
+ * CoreConnectivity documentation:
+ * http://msdn.microsoft.com/en-us/library/ee481381.aspx
+ * SmartDevice Connectivity documentation:
+ * http://msdn.microsoft.com/en-us/library/microsoft.smartdevice.connectivity.aspx
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+#include
+
+// Undefined
+struct ICcFormFactorContainer;
+struct ICcOSImage;
+struct ICcOSImageContainer;
+struct ICcPackageContainer;
+struct ICcProjectContainer;
+struct ICcServiceCategoryContainer;
+struct ICcServiceCB;
+struct ICcServiceInfo;
+struct ICcTransportStream;
+struct ICcTypeToArchitectureMap;
+
+// Defined
+struct ICcConnection;
+struct ICcCollection;
+struct ICcConnection3;
+struct ICcDatastore;
+struct ICcDevice;
+struct ICcDeviceContainer;
+struct ICcObject;
+struct ICcObjectContainer;
+struct ICcPlatform;
+struct ICcPlatformContainer;
+struct ICcProperty;
+struct ICcPropertyContainer;
+struct ICcServer;
+
+static const CLSID CLSID_ConMan = { 0x349AB2E8, 0x71B6, 0x4069, 0xAD, 0x9C, 0x11, 0x70, 0x84, 0x9D, 0xA6, 0x4C };
+
+typedef struct tagFileInfo{
+ LONG m_FileAttribues;
+ LONGLONG m_FileSize;
+ FILETIME m_CreationTime;
+ FILETIME m_LastAccessTime;
+ FILETIME m_LastWriteTime;
+} FileInfo;
+
+typedef struct tagFileVerifyVersion{
+ DWORD m_Major;
+ DWORD m_Minor;
+ DWORD m_Build;
+ DWORD m_Revision;
+} FileVerifyVersion;
+
+typedef struct tagFileVerifyInfo{
+ FileVerifyVersion m_AssemblyVersion;
+ FileVerifyVersion m_Win32Version;
+ BSTR m_Culture;
+ BYTE m_PublicKeyToken[12 + 3/*PUBLIC_KEY_TOKEN_LENGTH*/]; //### What is the key length?
+ DWORD m_Flags;
+} FileVerifyInfo;
+
+typedef struct tagFileVerifyReference{
+ BSTR m_Name;
+ BSTR m_SourcePath;
+ FileVerifyInfo m_Info;
+} FileVerifyReference;
+
+typedef struct tagFileVerifyResult{
+ DWORD m_Version;
+ FileVerifyInfo _Info;
+} FileVerifyResult;
+
+typedef struct tagPlatformInfo{
+ DWORD m_OSMajor;
+ DWORD m_OSMinor;
+ DWORD m_BuildNo;
+ DWORD m_ProcessorArchitecture;
+ DWORD m_InstructionSet;
+} SystemInfo;
+
+struct __declspec(uuid("{7A4AA9D3-0F9E-4CD4-8D52-62B6C0653752}")) ICcCollection : public IDispatch
+{
+ virtual HRESULT __stdcall get_Count(long *count) = 0;
+ virtual HRESULT __stdcall get_Item(long index, ICcObject **object) = 0;
+ virtual HRESULT __stdcall get_NewEnum(IUnknown **val) = 0;
+};
+
+struct __declspec(uuid("{CEF4C928-326F-49A9-B7E7-8FE7588B74B5}")) ICcConnection : public IDispatch
+{
+ virtual HRESULT __stdcall DeviceId(BSTR *deviceId) = 0;
+ virtual HRESULT __stdcall GetSystemInfo(SystemInfo *systemInfo) = 0;
+ virtual HRESULT __stdcall SendFile(BSTR desktopFile, BSTR deviceFile, DWORD creationFlags, BSTR customFileAction) = 0;
+ virtual HRESULT __stdcall ReceiveFile(BSTR deviceFile, BSTR desktopFile, DWORD fileAction) = 0;
+ virtual HRESULT __stdcall RemoveFile(BSTR deviceFile) = 0;
+ virtual HRESULT __stdcall GetFileInfo(BSTR deviceFile, FileInfo *fileInfo) = 0;
+ virtual HRESULT __stdcall SetFileInfo(BSTR deviceFile, FileInfo *fileInfo) = 0;
+ virtual HRESULT __stdcall DeleteDirectory(BSTR deviceDirectory, VARIANT_BOOL removeAll) = 0;
+ virtual HRESULT __stdcall MakeDirectory(BSTR deviceDirectory) = 0;
+ virtual HRESULT __stdcall DownloadPackage(BSTR packageId) = 0;
+ virtual HRESULT __stdcall LaunchProcess(BSTR executable, BSTR arguments, DWORD creationFlags, DWORD *processId, DWORD *processHandle) = 0;
+ virtual HRESULT __stdcall TerminateProcess(DWORD processId) = 0;
+ virtual HRESULT __stdcall GetProcessExitCode(DWORD processId, VARIANT_BOOL *processExited, DWORD *exitCode) = 0;
+ virtual HRESULT __stdcall RegistryCreateKey(LONG key, BSTR subKey) = 0;
+ virtual HRESULT __stdcall RegistryDeleteKey(LONG key, BSTR subKey) = 0;
+ virtual HRESULT __stdcall RegistrySetValue(LONG key, BSTR subKey, BSTR valueName, DWORD type, BSTR data, DWORD length) = 0;
+ virtual HRESULT __stdcall RegistryQueryValue(LONG key, BSTR subKey, BSTR valueName, DWORD type, WCHAR *value, LONG *length) = 0;
+ virtual HRESULT __stdcall RegistryDeleteValue(LONG key, BSTR subKey, BSTR valueName) = 0;
+ virtual HRESULT __stdcall IsConnected(VARIANT_BOOL *connected) = 0;
+ virtual HRESULT __stdcall VerifyFilesInstalled(DWORD arraySize, FileVerifyReference *infoArray, FileVerifyResult *existenceArray) = 0;
+ virtual HRESULT __stdcall ConnectDevice() = 0;
+ virtual HRESULT __stdcall DisconnectDevice() = 0;
+ virtual HRESULT __stdcall SearchFileSystem(BSTR criteria, BSTR startingDirectory, SAFEARRAY/*