Changeset 846 for trunk/demos/shared

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/shared/arthurstyle.cpp (modified) (1 diff)
• demos/shared/arthurstyle.h (modified) (1 diff)
• demos/shared/arthurwidgets.cpp (modified) (1 diff)
• demos/shared/arthurwidgets.h (modified) (1 diff)
• demos/shared/hoverpoints.cpp (modified) (1 diff)
• demos/shared/hoverpoints.h (modified) (1 diff)
• demos/shared/shared.pri (modified) (1 diff)

trunk/demos/shared/arthurstyle.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/shared/arthurstyle.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/shared/arthurwidgets.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/shared/arthurwidgets.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/shared/hoverpoints.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/shared/hoverpoints.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/demos/shared/shared.pri

@@ -7 +7 @@
 contains(CONFIG, debug_and_release_target) {    
     CONFIG(debug, debug|release) { 
-        LIBS+=-L$$SHARED_FOLDER/debug
+        QMAKE_LIBDIR += $$SHARED_FOLDER/debug
     } else {
-        LIBS+=-L$$SHARED_FOLDER/release
+        QMAKE_LIBDIR += $$SHARED_FOLDER/release
     }
 } else {
-    LIBS += -L$$SHARED_FOLDER
+    QMAKE_LIBDIR += $$SHARED_FOLDER
 }