Showing the changes to interface/src/Application.cpp (1 of 6 files). Show all
Unified · Split
| @@ -225,8 +225,8 @@ · 224 unmodified lines | ||
| 225 | 225 | #ifdef DEBUG_EVENT_QUEUE |
| 226 | 226 | // This is a HACK that uses private headers included with the qt source distrubution. |
| 227 | 227 | // To use this feature you need to add these directores to your include path: |
| 228 | −// E:/Qt/5.9.1/Src/qtbase/include/QtCore/5.9.1/QtCore | |
| 229 | −// E:/Qt/5.9.1/Src/qtbase/include/QtCore/5.9.1 | |
| 228 | +// E:/Qt/5.10.1/Src/qtbase/include/QtCore/5.10.1/QtCore | |
| 229 | +// E:/Qt/5.10.1/Src/qtbase/include/QtCore/5.10.1 | |
| 230 | 230 | #define QT_BOOTSTRAPPED |
| 231 | 231 | #include <private/qthread_p.h> |
| 232 | 232 | #include <private/qobject_p.h> |
| @@ -2038,7 +2038,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1805 unmodified lines | ||
| 2038 | 2038 | }); |
| 2039 | 2039 | |
| 2040 | 2040 | _snapshotSound = DependencyManager::get<SoundCache>()->getSound(PathUtils::resourcesUrl("sounds/snap.wav")); |
| 2041 | − | |
| 2041 | + | |
| 2042 | 2042 | QVariant testProperty = property(hifi::properties::TEST); |
| 2043 | 2043 | qDebug() << testProperty; |
| 2044 | 2044 | if (testProperty.isValid()) { |
| @@ -6577,7 +6577,7 @@ void Application::addAssetToWorldFromURL(QString url) { · 4532 unmodified lines | ||
| 6577 | 6577 | } else { |
| 6578 | 6578 | filename.remove(".zip"); |
| 6579 | 6579 | } |
| 6580 | − | |
| 6580 | + | |
| 6581 | 6581 | } |
| 6582 | 6582 | |
| 6583 | 6583 | if (!DependencyManager::get<NodeList>()->getThisNodeCanWriteAssets()) { |
| @@ -6751,7 +6751,7 @@ void Application::addAssetToWorldSetMapping(QString filePath, QString mapping, Q · 167 unmodified lines | ||
| 6751 | 6751 | addAssetToWorldError(filenameFromPath(filePath), errorInfo); |
| 6752 | 6752 | } else { |
| 6753 | 6753 | // to prevent files that aren't models or texture files from being loaded into world automatically |
| 6754 | − if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) || | |
| 6754 | + if ((filePath.toLower().endsWith(OBJ_EXTENSION) || filePath.toLower().endsWith(FBX_EXTENSION)) || | |
| 6755 | 6755 | ((filePath.toLower().endsWith(JPG_EXTENSION) || filePath.toLower().endsWith(PNG_EXTENSION)) && |
| 6756 | 6756 | ((!isBlocks) && (!isZip)))) { |
| 6757 | 6757 | addAssetToWorldAddEntity(filePath, mapping); |
| @@ -7400,8 +7400,8 @@ bool Application::isThrottleRendering() const { · 642 unmodified lines | ||
| 7400 | 7400 | bool Application::hasFocus() const { |
| 7401 | 7401 | bool result = (QApplication::activeWindow() != nullptr); |
| 7402 | 7402 | #if defined(Q_OS_WIN) |
| 7403 | − // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't | |
| 7404 | − // take user focus away from their current window. So also check whether the application is the user's current foreground | |
| 7403 | + // On Windows, QWidget::activateWindow() - as called in setFocus() - makes the application's taskbar icon flash but doesn't | |
| 7404 | + // take user focus away from their current window. So also check whether the application is the user's current foreground | |
| 7405 | 7405 | // window. |
| 7406 | 7406 | result = result && (HWND)QApplication::activeWindow()->winId() == GetForegroundWindow(); |
| 7407 | 7407 | #endif |
| @@ -7409,7 +7409,7 @@ bool Application::hasFocus() const { · 1 unmodified line | ||
| 7409 | 7409 | } |
| 7410 | 7410 | |
| 7411 | 7411 | void Application::setFocus() { |
| 7412 | − // Note: Windows doesn't allow a user focus to be taken away from another application. Instead, it changes the color of and | |
| 7412 | + // Note: Windows doesn't allow a user focus to be taken away from another application. Instead, it changes the color of and | |
| 7413 | 7413 | // flashes the taskbar icon. |
| 7414 | 7414 | auto window = qApp->getWindow(); |
| 7415 | 7415 | window->activateWindow(); |
| @@ -7650,7 +7650,7 @@ void Application::updateDisplayMode() { · 234 unmodified lines | ||
| 7650 | 7650 | menu->setIsOptionChecked(MenuOption::FirstPerson, true); |
| 7651 | 7651 | cameraMenuChanged(); |
| 7652 | 7652 | } |
| 7653 | − | |
| 7653 | + | |
| 7654 | 7654 | // Remove the mirror camera option from menu if in HMD mode |
| 7655 | 7655 | auto mirrorAction = menu->getActionForOption(MenuOption::FullscreenMirror); |
| 7656 | 7656 | mirrorAction->setVisible(!isHmd); |