Merge remote branch 'gerrit/master' into refactor

Conflicts:
	src/gui/image/qicon.cpp
	src/gui/image/qicon.h
	src/gui/image/qicon_p.h
	src/gui/text/qfontdatabase.cpp
	src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
	src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
	src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
	sync.profile

Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4

15 files changed, 7 insertions, 7 deletions

diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro
index b9ff53fb12..8670fcb3a5 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/embedded/embedded.pro
@@ -1,5 +1,5 @@
 TEMPLATE  = subdirs
-SUBDIRS   = styledemo raycasting flickable digiflip
+SUBDIRS   = styleexample raycasting flickable digiflip
 
 SUBDIRS += lightmaps
 SUBDIRS += flightinfo
diff --git a/examples/embedded/styledemo/files/add.png b/examples/embedded/styleexample/files/add.png
index fc5c16d4c8..fc5c16d4c8 100755
--- a/examples/embedded/styledemo/files/add.png
+++ b/examples/embedded/styleexample/files/add.png
diff --git a/examples/embedded/styledemo/files/application.qss b/examples/embedded/styleexample/files/application.qss
index 432fe6bc76..432fe6bc76 100644
--- a/examples/embedded/styledemo/files/application.qss
+++ b/examples/embedded/styleexample/files/application.qss
diff --git a/examples/embedded/styledemo/files/blue.qss b/examples/embedded/styleexample/files/blue.qss
index ac8671b5e4..ac8671b5e4 100644
--- a/examples/embedded/styledemo/files/blue.qss
+++ b/examples/embedded/styleexample/files/blue.qss
diff --git a/examples/embedded/styledemo/files/khaki.qss b/examples/embedded/styleexample/files/khaki.qss
index b0d4a0fa6f..b0d4a0fa6f 100644
--- a/examples/embedded/styledemo/files/khaki.qss
+++ b/examples/embedded/styleexample/files/khaki.qss
diff --git a/examples/embedded/styledemo/files/nature_1.jpg b/examples/embedded/styleexample/files/nature_1.jpg
index 3a04edb96a..3a04edb96a 100644
--- a/examples/embedded/styledemo/files/nature_1.jpg
+++ b/examples/embedded/styleexample/files/nature_1.jpg
diff --git a/examples/embedded/styledemo/files/nostyle.qss b/examples/embedded/styleexample/files/nostyle.qss
index e69de29bb2..e69de29bb2 100644
--- a/examples/embedded/styledemo/files/nostyle.qss
+++ b/examples/embedded/styleexample/files/nostyle.qss
diff --git a/examples/embedded/styledemo/files/remove.png b/examples/embedded/styleexample/files/remove.png
index a0ab1fa21a..a0ab1fa21a 100755
--- a/examples/embedded/styledemo/files/remove.png
+++ b/examples/embedded/styleexample/files/remove.png
diff --git a/examples/embedded/styledemo/files/transparent.qss b/examples/embedded/styleexample/files/transparent.qss
index b38eb366f4..b38eb366f4 100644
--- a/examples/embedded/styledemo/files/transparent.qss
+++ b/examples/embedded/styleexample/files/transparent.qss
diff --git a/examples/embedded/styledemo/main.cpp b/examples/embedded/styleexample/main.cpp
index 7a484b0365..d3c228a59e 100644
--- a/examples/embedded/styledemo/main.cpp
+++ b/examples/embedded/styleexample/main.cpp
@@ -45,7 +45,7 @@
 int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
-    Q_INIT_RESOURCE(styledemo);
+    Q_INIT_RESOURCE(styleexample);
 
     app.setApplicationName("style");
     app.setOrganizationName("Nokia");
diff --git a/examples/embedded/styledemo/styledemo.pro b/examples/embedded/styleexample/styleexample.pro
index e8a428106c..5b1273e6aa 100644
--- a/examples/embedded/styledemo/styledemo.pro
+++ b/examples/embedded/styleexample/styleexample.pro
@@ -4,15 +4,15 @@ TEMPLATE = app
 HEADERS += stylewidget.h
 FORMS += stylewidget.ui
 SOURCES += main.cpp stylewidget.cpp
-RESOURCES += styledemo.qrc
+RESOURCES += styleexample.qrc
 
-target.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/styledemo
+target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html
-sources.path = $$[QT_INSTALL_DEMOS]/qtbase/embedded/styledemo
+sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/embedded/styleexample
 INSTALLS += target sources
 
 symbian {
     TARGET.UID3 = 0xA000A63F
-    CONFIG += qt_demo
+    CONFIG += qt_example
 }
 QT += widgets widgets
diff --git a/examples/embedded/styledemo/styledemo.qrc b/examples/embedded/styleexample/styleexample.qrc
index 96237d4203..96237d4203 100644
--- a/examples/embedded/styledemo/styledemo.qrc
+++ b/examples/embedded/styleexample/styleexample.qrc
diff --git a/examples/embedded/styledemo/stylewidget.cpp b/examples/embedded/styleexample/stylewidget.cpp
index 7bac8a84d7..7bac8a84d7 100644
--- a/examples/embedded/styledemo/stylewidget.cpp
+++ b/examples/embedded/styleexample/stylewidget.cpp
diff --git a/examples/embedded/styledemo/stylewidget.h b/examples/embedded/styleexample/stylewidget.h
index 11fa5348de..11fa5348de 100644
--- a/examples/embedded/styledemo/stylewidget.h
+++ b/examples/embedded/styleexample/stylewidget.h
diff --git a/examples/embedded/styledemo/stylewidget.ui b/examples/embedded/styleexample/stylewidget.ui
index 767f44aead..ebe2961ec6 100644
--- a/examples/embedded/styledemo/stylewidget.ui
+++ b/examples/embedded/styleexample/stylewidget.ui
@@ -314,7 +314,7 @@
   </layout>
  </widget>
  <resources>
-  <include location="StyleDemo.qrc"/>
+  <include location="styleexample.qrc"/>
  </resources>
  <connections>
   <connection>