From d32f47b70387713335656a8e93f289c819fb9b05 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen
Date: Wed, 3 Jun 2015 17:04:53 +0200
Subject: fix usage of wince scope
Fix style issues along the way.
Change-Id: Ic6a6de28e198eb0b14c198b802e78845703909b9
Reviewed-by: Joerg Bornemann
---
examples/widgets/dialogs/dialogs.pro | 11 +++++++----
examples/widgets/draganddrop/draganddrop.pro | 2 +-
examples/widgets/draganddrop/puzzle/puzzle.pro | 2 +-
examples/widgets/graphicsview/boxes/boxes.pro | 2 +-
examples/widgets/painting/affine/affine.pro | 2 +-
.../widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro | 2 +-
examples/widgets/widgets/icons/icons.pro | 2 +-
examples/widgets/widgets/imageviewer/imageviewer.pro | 2 +-
examples/widgets/widgets/movie/movie.pro | 2 +-
9 files changed, 15 insertions(+), 12 deletions(-)
(limited to 'examples/widgets')
diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro
index d30c29778f..7a01e818e0 100644
--- a/examples/widgets/dialogs/dialogs.pro
+++ b/examples/widgets/dialogs/dialogs.pro
@@ -5,10 +5,13 @@ SUBDIRS = classwizard \
tabdialog \
trivialwizard
-!wince*: SUBDIRS += licensewizard \
- extension \
- findfiles
+!wince {
+ SUBDIRS += \
+ licensewizard \
+ extension \
+ findfiles
+}
!qtHaveModule(printsupport): SUBDIRS -= licensewizard
contains(DEFINES, QT_NO_WIZARD): SUBDIRS -= trivialwizard licensewizard classwizard
-wince*: SUBDIRS += sipdialog
+wince: SUBDIRS += sipdialog
diff --git a/examples/widgets/draganddrop/draganddrop.pro b/examples/widgets/draganddrop/draganddrop.pro
index 098651d2f6..eb678eecd8 100644
--- a/examples/widgets/draganddrop/draganddrop.pro
+++ b/examples/widgets/draganddrop/draganddrop.pro
@@ -5,4 +5,4 @@ SUBDIRS = draggableicons \
fridgemagnets \
puzzle
-wince*: SUBDIRS -= dropsite
+wince: SUBDIRS -= dropsite
diff --git a/examples/widgets/draganddrop/puzzle/puzzle.pro b/examples/widgets/draganddrop/puzzle/puzzle.pro
index 95008fc29b..67fff21a26 100644
--- a/examples/widgets/draganddrop/puzzle/puzzle.pro
+++ b/examples/widgets/draganddrop/puzzle/puzzle.pro
@@ -15,7 +15,7 @@ QMAKE_PROJECT_NAME = dndpuzzle
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle
INSTALLS += target
-wince*: {
+wince {
addFile.files = example.jpg
addFile.path = .
DEPLOYMENT += addFile
diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro
index 15d26f02f0..38aae1c2c4 100644
--- a/examples/widgets/graphicsview/boxes/boxes.pro
+++ b/examples/widgets/graphicsview/boxes/boxes.pro
@@ -25,6 +25,6 @@ RESOURCES += boxes.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes
INSTALLS += target
-wince*: {
+wince {
DEPLOYMENT_PLUGIN += qjpeg
}
diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro
index 1f2f8df87f..be6a83960d 100644
--- a/examples/widgets/painting/affine/affine.pro
+++ b/examples/widgets/painting/affine/affine.pro
@@ -17,6 +17,6 @@ RESOURCES += affine.qrc
target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine
INSTALLS += target
-wince*: {
+wince {
DEPLOYMENT_PLUGIN += qjpeg
}
diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
index 640f36f9b8..19f471b5cf 100644
--- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
+++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro
@@ -11,7 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter
INSTALLS += target
-wince*: {
+wince {
addFiles.files = main.cpp mainwindow.cpp
addFiles.path = .
DEPLOYMENT += addFiles
diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro
index 51d8b79ba9..21165163aa 100644
--- a/examples/widgets/widgets/icons/icons.pro
+++ b/examples/widgets/widgets/icons/icons.pro
@@ -17,7 +17,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons
INSTALLS += target
-wince*: {
+wince {
imageFiles.files = images/*
wincewm*: {
imageFiles.path = "/My Documents/My Pictures"
diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro
index 6c9d4a715a..2853f1699f 100644
--- a/examples/widgets/widgets/imageviewer/imageviewer.pro
+++ b/examples/widgets/widgets/imageviewer/imageviewer.pro
@@ -10,6 +10,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer
INSTALLS += target
-wince*: {
+wince {
DEPLOYMENT_PLUGIN += qjpeg qgif
}
diff --git a/examples/widgets/widgets/movie/movie.pro b/examples/widgets/widgets/movie/movie.pro
index 6d333edfa8..86d85552c2 100644
--- a/examples/widgets/widgets/movie/movie.pro
+++ b/examples/widgets/widgets/movie/movie.pro
@@ -11,7 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie
INSTALLS += target
-wince*: {
+wince {
addFiles.files += *.gif
addFiles.path = .
DEPLOYMENT += addFiles
--
cgit v1.2.3
From e1b7c55a43ed62fb558cb3895865cef2b2d63fe6 Mon Sep 17 00:00:00 2001
From: Nico Vertriest
Date: Wed, 10 Jun 2015 09:49:29 +0200
Subject: Doc: rearrange tables with overflow
Task-number: QTBUG-46475
Change-Id: Id599b2eb0dee0c003475c094ad61700150e37e65
Reviewed-by: Venugopal Shivashankar
---
examples/widgets/tutorials/widgets/childwidget/main.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'examples/widgets')
diff --git a/examples/widgets/tutorials/widgets/childwidget/main.cpp b/examples/widgets/tutorials/widgets/childwidget/main.cpp
index b89e6f1c4a..84fcf1ea80 100644
--- a/examples/widgets/tutorials/widgets/childwidget/main.cpp
+++ b/examples/widgets/tutorials/widgets/childwidget/main.cpp
@@ -46,7 +46,8 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QWidget window;
window.resize(320, 240);
- window.setWindowTitle(QApplication::translate("childwidget", "Child widget"));
+ window.setWindowTitle
+ (QApplication::translate("childwidget", "Child widget"));
window.show();
//! [create, position and show]
--
cgit v1.2.3
From a7f2af09114cfa0996794c85bc48a601f665772d Mon Sep 17 00:00:00 2001
From: Nico Vertriest
Date: Thu, 28 May 2015 12:45:48 +0200
Subject: Replace MAC OS X with OS X
Task-number: QTBUG-46374
Change-Id: I7bc633ab551740bd328a24b0ccae1d534af47138
Reviewed-by: Martin Smith
---
examples/widgets/doc/src/application.qdoc | 6 +++---
examples/widgets/doc/src/classwizard.qdoc | 4 ++--
examples/widgets/doc/src/licensewizard.qdoc | 4 ++--
examples/widgets/doc/src/plugandpaint.qdoc | 2 +-
examples/widgets/mainwindows/mainwindow/mainwindow.cpp | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
(limited to 'examples/widgets')
diff --git a/examples/widgets/doc/src/application.qdoc b/examples/widgets/doc/src/application.qdoc
index e20480198a..ac32c592fc 100644
--- a/examples/widgets/doc/src/application.qdoc
+++ b/examples/widgets/doc/src/application.qdoc
@@ -232,7 +232,7 @@
Just before we create the \uicontrol{Help} menu, we call
QMenuBar::addSeparator(). This has no effect for most widget
- styles (e.g., Windows and Mac OS X styles), but for some
+ styles (e.g., Windows and OS X styles), but for some
styles this makes sure that \uicontrol{Help} is pushed to the right
side of the menu bar.
@@ -258,7 +258,7 @@
load the user's preferences and other application settings. The
QSettings class provides a high-level interface for storing
settings permanently on disk. On Windows, it uses the (in)famous
- Windows registry; on Mac OS X, it uses the native XML-based
+ Windows registry; on OS X, it uses the native XML-based
CFPreferences API; on Unix/X11, it uses text files.
The QSettings constructor takes arguments that identify your
@@ -310,7 +310,7 @@
We start by opening the file in read-only mode. The QFile::Text
flag indicates that the file is a text file, not a binary file.
- On Unix and Mac OS X, this makes no difference, but on Windows,
+ On Unix and OS X, this makes no difference, but on Windows,
it ensures that the "\\r\\n" end-of-line sequence is converted to
"\\n" when reading.
diff --git a/examples/widgets/doc/src/classwizard.qdoc b/examples/widgets/doc/src/classwizard.qdoc
index 98a831da98..579dcb2055 100644
--- a/examples/widgets/doc/src/classwizard.qdoc
+++ b/examples/widgets/doc/src/classwizard.qdoc
@@ -76,7 +76,7 @@
\endlist
Although the program is just an example, if you press \uicontrol Finish
- (\uicontrol Done on Mac OS X), actual C++ source files will actually be
+ (\uicontrol Done on OS X), actual C++ source files will actually be
generated.
\section1 The ClassWizard Class
@@ -158,7 +158,7 @@
layouts. The \c className field is created with an asterisk (\c
*) next to its name. This makes it a \l{mandatory fields}{mandatory field}, that
is, a field that must be filled before the user can press the
- \uicontrol Next button (\uicontrol Continue on Mac OS X). The fields' values
+ \uicontrol Next button (\uicontrol Continue on OS X). The fields' values
can be accessed from any other page using QWizardPage::field(),
or from the wizard code using QWizard::field().
diff --git a/examples/widgets/doc/src/licensewizard.qdoc b/examples/widgets/doc/src/licensewizard.qdoc
index 37d67334a1..29e2f2779a 100644
--- a/examples/widgets/doc/src/licensewizard.qdoc
+++ b/examples/widgets/doc/src/licensewizard.qdoc
@@ -94,7 +94,7 @@
\snippet dialogs/licensewizard/licensewizard.cpp 4
We set the style to \l{QWizard::}{ModernStyle} on all platforms
- except Mac OS X,
+ except OS X,
\snippet dialogs/licensewizard/licensewizard.cpp 5
\snippet dialogs/licensewizard/licensewizard.cpp 6
@@ -160,7 +160,7 @@
layouts. The fields are created with an asterisk (\c
*) next to their name. This makes them \l{mandatory fields}, that
is, fields that must be filled before the user can press the
- \uicontrol Next button (\uicontrol Continue on Mac OS X). The fields' values
+ \uicontrol Next button (\uicontrol Continue on OS X). The fields' values
can be accessed from any other page using QWizardPage::field().
Resetting the page amounts to clearing the two text fields.
diff --git a/examples/widgets/doc/src/plugandpaint.qdoc b/examples/widgets/doc/src/plugandpaint.qdoc
index a1e26272bc..cf83ea3507 100644
--- a/examples/widgets/doc/src/plugandpaint.qdoc
+++ b/examples/widgets/doc/src/plugandpaint.qdoc
@@ -162,7 +162,7 @@
subdirectory of the Plug & Paint example. On Unix, this is just a
matter of initializing the QDir variable with
QApplication::applicationDirPath(), the path of the executable
- file, and to do a \l{QDir::cd()}{cd()}. On Windows and Mac OS X,
+ file, and to do a \l{QDir::cd()}{cd()}. On Windows and OS X,
this file is usually located in a subdirectory, so we need to
take this into account.
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
index 70a8644b47..6349f7aa2e 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
@@ -68,7 +68,7 @@ static const char * const message =
"(right-click) menu.
"
#ifdef Q_OS_MAC
- "On Mac OS X, the \"Black\" dock widget has been created as a "
+ "
On OS X, the \"Black\" dock widget has been created as a "
"Drawer, which is a special kind of QDockWidget.
"
#endif
;
--
cgit v1.2.3